Deleted Added
full compact
ieee80211_node.c (183255) ieee80211_node.c (183256)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 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-2008 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 183255 2008-09-21 23:59:14Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 183256 2008-09-22 00:10:22Z sam $");
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>

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

2259 ieee80211_node_join_11g(ni);
2260 IEEE80211_UNLOCK(ic);
2261
2262 newassoc = 1;
2263 } else
2264 newassoc = 0;
2265
2266 IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ni,
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>

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

2259 ieee80211_node_join_11g(ni);
2260 IEEE80211_UNLOCK(ic);
2261
2262 newassoc = 1;
2263 } else
2264 newassoc = 0;
2265
2266 IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ni,
2267 "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s",
2267 "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s",
2268 IEEE80211_NODE_AID(ni),
2269 ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
2270 ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
2271 ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
2272 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
2273 ni->ni_flags & IEEE80211_NODE_HT ?
2274 (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
2275 ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
2276 ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" :
2277 ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "",
2268 IEEE80211_NODE_AID(ni),
2269 ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
2270 ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
2271 ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
2272 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
2273 ni->ni_flags & IEEE80211_NODE_HT ?
2274 (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
2275 ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
2276 ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" :
2277 ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "",
2278 ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "",
2278 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
2279 ", fast-frames" : "",
2280 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ?
2281 ", turbo" : ""
2282 );
2283
2284 node_setuptxparms(ni);
2285 /* give driver a chance to setup state like ni_txrate */

--- 264 unchanged lines hidden ---
2279 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
2280 ", fast-frames" : "",
2281 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ?
2282 ", turbo" : ""
2283 );
2284
2285 node_setuptxparms(ni);
2286 /* give driver a chance to setup state like ni_txrate */

--- 264 unchanged lines hidden ---