Deleted Added
full compact
ieee80211.c (195379) ieee80211.c (195618)
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.c 195379 2009-07-05 18:17:37Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 195618 2009-07-11 15:02:45Z rpaulo $");
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

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

69/* map ieee80211_opmode to the corresponding capability bit */
70const int ieee80211_opcap[IEEE80211_OPMODE_MAX] = {
71 [IEEE80211_M_IBSS] = IEEE80211_C_IBSS,
72 [IEEE80211_M_WDS] = IEEE80211_C_WDS,
73 [IEEE80211_M_STA] = IEEE80211_C_STA,
74 [IEEE80211_M_AHDEMO] = IEEE80211_C_AHDEMO,
75 [IEEE80211_M_HOSTAP] = IEEE80211_C_HOSTAP,
76 [IEEE80211_M_MONITOR] = IEEE80211_C_MONITOR,
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

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

69/* map ieee80211_opmode to the corresponding capability bit */
70const int ieee80211_opcap[IEEE80211_OPMODE_MAX] = {
71 [IEEE80211_M_IBSS] = IEEE80211_C_IBSS,
72 [IEEE80211_M_WDS] = IEEE80211_C_WDS,
73 [IEEE80211_M_STA] = IEEE80211_C_STA,
74 [IEEE80211_M_AHDEMO] = IEEE80211_C_AHDEMO,
75 [IEEE80211_M_HOSTAP] = IEEE80211_C_HOSTAP,
76 [IEEE80211_M_MONITOR] = IEEE80211_C_MONITOR,
77#ifdef IEEE80211_SUPPORT_MESH
78 [IEEE80211_M_MBSS] = IEEE80211_C_MBSS,
79#endif
77};
78
79static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
80 { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
81
82static void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag);
83static void ieee80211_syncflag_ht_locked(struct ieee80211com *ic, int flag);
84static void ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag);

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

955 if (caps & IEEE80211_C_HOSTAP)
956 ADD(media, mword, mopt | IFM_IEEE80211_HOSTAP);
957 if (caps & IEEE80211_C_AHDEMO)
958 ADD(media, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0);
959 if (caps & IEEE80211_C_MONITOR)
960 ADD(media, mword, mopt | IFM_IEEE80211_MONITOR);
961 if (caps & IEEE80211_C_WDS)
962 ADD(media, mword, mopt | IFM_IEEE80211_WDS);
80};
81
82static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
83 { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
84
85static void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag);
86static void ieee80211_syncflag_ht_locked(struct ieee80211com *ic, int flag);
87static void ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag);

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

958 if (caps & IEEE80211_C_HOSTAP)
959 ADD(media, mword, mopt | IFM_IEEE80211_HOSTAP);
960 if (caps & IEEE80211_C_AHDEMO)
961 ADD(media, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0);
962 if (caps & IEEE80211_C_MONITOR)
963 ADD(media, mword, mopt | IFM_IEEE80211_MONITOR);
964 if (caps & IEEE80211_C_WDS)
965 ADD(media, mword, mopt | IFM_IEEE80211_WDS);
966 if (caps & IEEE80211_C_MBSS)
967 ADD(media, mword, mopt | IFM_IEEE80211_MBSS);
963#undef ADD
964}
965
966/*
967 * Setup the media data structures according to the channel and
968 * rate tables.
969 */
970static int

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

1259 status |= IFM_IEEE80211_MONITOR;
1260 break;
1261 case IEEE80211_M_AHDEMO:
1262 status |= IFM_IEEE80211_ADHOC | IFM_FLAG0;
1263 break;
1264 case IEEE80211_M_WDS:
1265 status |= IFM_IEEE80211_WDS;
1266 break;
968#undef ADD
969}
970
971/*
972 * Setup the media data structures according to the channel and
973 * rate tables.
974 */
975static int

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

1264 status |= IFM_IEEE80211_MONITOR;
1265 break;
1266 case IEEE80211_M_AHDEMO:
1267 status |= IFM_IEEE80211_ADHOC | IFM_FLAG0;
1268 break;
1269 case IEEE80211_M_WDS:
1270 status |= IFM_IEEE80211_WDS;
1271 break;
1272 case IEEE80211_M_MBSS:
1273 status |= IFM_IEEE80211_MBSS;
1274 break;
1267 }
1268 if (IEEE80211_IS_CHAN_HTA(chan)) {
1269 status |= IFM_IEEE80211_11NA;
1270 } else if (IEEE80211_IS_CHAN_HTG(chan)) {
1271 status |= IFM_IEEE80211_11NG;
1272 } else if (IEEE80211_IS_CHAN_A(chan)) {
1273 status |= IFM_IEEE80211_11A;
1274 } else if (IEEE80211_IS_CHAN_B(chan)) {

--- 333 unchanged lines hidden ---
1275 }
1276 if (IEEE80211_IS_CHAN_HTA(chan)) {
1277 status |= IFM_IEEE80211_11NA;
1278 } else if (IEEE80211_IS_CHAN_HTG(chan)) {
1279 status |= IFM_IEEE80211_11NG;
1280 } else if (IEEE80211_IS_CHAN_A(chan)) {
1281 status |= IFM_IEEE80211_11A;
1282 } else if (IEEE80211_IS_CHAN_B(chan)) {

--- 333 unchanged lines hidden ---