Deleted Added
full compact
ieee80211_sta.c (183255) ieee80211_sta.c (183256)
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 183255 2008-09-21 23:59:14Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 183256 2008-09-22 00:10:22Z sam $");
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

1533 */
1534 if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
1535 (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION))
1536 ic->ic_flags |= IEEE80211_F_USEPROT;
1537 else
1538 ic->ic_flags &= ~IEEE80211_F_USEPROT;
1539 IEEE80211_NOTE_MAC(vap,
1540 IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2,
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

1533 */
1534 if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
1535 (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION))
1536 ic->ic_flags |= IEEE80211_F_USEPROT;
1537 else
1538 ic->ic_flags &= ~IEEE80211_F_USEPROT;
1539 IEEE80211_NOTE_MAC(vap,
1540 IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2,
1541 "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s",
1541 "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s",
1542 ISREASSOC(subtype) ? "re" : "",
1543 IEEE80211_NODE_AID(ni),
1544 ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long",
1545 ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long",
1546 ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "",
1547 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
1548 ni->ni_flags & IEEE80211_NODE_HT ?
1549 (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
1550 ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
1551 ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" :
1552 ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "",
1542 ISREASSOC(subtype) ? "re" : "",
1543 IEEE80211_NODE_AID(ni),
1544 ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long",
1545 ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long",
1546 ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "",
1547 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
1548 ni->ni_flags & IEEE80211_NODE_HT ?
1549 (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
1550 ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
1551 ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" :
1552 ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "",
1553 ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "",
1553 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
1554 ", fast-frames" : "",
1555 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ?
1556 ", turbo" : ""
1557 );
1558 ieee80211_new_state(vap, IEEE80211_S_RUN, subtype);
1559 break;
1560 }

--- 86 unchanged lines hidden ---
1554 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
1555 ", fast-frames" : "",
1556 IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ?
1557 ", turbo" : ""
1558 );
1559 ieee80211_new_state(vap, IEEE80211_S_RUN, subtype);
1560 break;
1561 }

--- 86 unchanged lines hidden ---