Deleted Added
full compact
ieee80211_node.c (214894) ieee80211_node.c (217511)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 214894 2010-11-06 18:17:20Z bschmidt $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 217511 2011-01-17 20:15:15Z bschmidt $");
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

--- 1095 unchanged lines hidden (view full) ---

1132 ni->ni_table = nt;
1133 ni->ni_vap = vap;
1134 ni->ni_ic = ic;
1135 IEEE80211_NODE_UNLOCK(nt);
1136
1137 IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni,
1138 "%s: inact_reload %u", __func__, ni->ni_inact_reload);
1139
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

--- 1095 unchanged lines hidden (view full) ---

1132 ni->ni_table = nt;
1133 ni->ni_vap = vap;
1134 ni->ni_ic = ic;
1135 IEEE80211_NODE_UNLOCK(nt);
1136
1137 IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni,
1138 "%s: inact_reload %u", __func__, ni->ni_inact_reload);
1139
1140 ieee80211_ratectl_node_init(ni);
1141
1140 return ni;
1141}
1142
1143/*
1144 * Craft a temporary node suitable for sending a management frame
1145 * to the specified station. We craft only as much state as we
1146 * need to do the work since the node will be immediately reclaimed
1147 * once the send completes.

--- 21 unchanged lines hidden (view full) ---

1169 ieee80211_node_initref(ni); /* mark referenced */
1170 /* NB: required by ieee80211_fix_rate */
1171 ieee80211_node_set_chan(ni, bss->ni_chan);
1172 ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
1173 IEEE80211_KEYIX_NONE);
1174 ni->ni_txpower = bss->ni_txpower;
1175 /* XXX optimize away */
1176 ieee80211_psq_init(&ni->ni_psq, "unknown");
1142 return ni;
1143}
1144
1145/*
1146 * Craft a temporary node suitable for sending a management frame
1147 * to the specified station. We craft only as much state as we
1148 * need to do the work since the node will be immediately reclaimed
1149 * once the send completes.

--- 21 unchanged lines hidden (view full) ---

1171 ieee80211_node_initref(ni); /* mark referenced */
1172 /* NB: required by ieee80211_fix_rate */
1173 ieee80211_node_set_chan(ni, bss->ni_chan);
1174 ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
1175 IEEE80211_KEYIX_NONE);
1176 ni->ni_txpower = bss->ni_txpower;
1177 /* XXX optimize away */
1178 ieee80211_psq_init(&ni->ni_psq, "unknown");
1179
1180 ieee80211_ratectl_node_init(ni);
1177 } else {
1178 /* XXX msg */
1179 vap->iv_stats.is_rx_nodealloc++;
1180 }
1181 return ni;
1182}
1183
1184struct ieee80211_node *

--- 1451 unchanged lines hidden ---
1181 } else {
1182 /* XXX msg */
1183 vap->iv_stats.is_rx_nodealloc++;
1184 }
1185 return ni;
1186}
1187
1188struct ieee80211_node *

--- 1451 unchanged lines hidden ---