From 9fb3122e7aaaf8f513d3eb74c7364d0c3059298d Mon Sep 17 00:00:00 2001 From: proski Date: Thu, 24 Jul 2008 01:46:25 +0000 Subject: [PATCH] Reduce difference with the DFS branch git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3820 0192ed92-7a03-0410-a25b-9323aeb14dbd --- net80211/_ieee80211.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net80211/_ieee80211.h b/net80211/_ieee80211.h index b55a9de..dccad3c 100644 --- a/net80211/_ieee80211.h +++ b/net80211/_ieee80211.h @@ -36,7 +36,7 @@ /* Warning : ieee80211_phytype is used by the HAL in its ABI, so this * enumeration cannot be changed */ - + enum ieee80211_phytype { IEEE80211_T_DS = 0, /* direct sequence spread spectrum */ IEEE80211_T_FH = 1, /* frequency hopping */ @@ -161,6 +161,8 @@ struct ieee80211_channel { /* bits 0-3 are for private use by drivers */ /* channel attributes */ +#define IEEE80211_CHAN_INDOOR 0x0004 /* This channel can be used indoor */ +#define IEEE80211_CHAN_OUTDOOR 0x0008 /* This channel can be used outdoor */ #define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */ #define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */ #define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */ @@ -200,6 +202,10 @@ struct ieee80211_channel { #define IEEE80211_CHAN_ALLTURBO \ (IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO) +#define IEEE80211_IS_CHAN_INDOOR(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_INDOOR) != 0) +#define IEEE80211_IS_CHAN_OUTDOOR(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_OUTDOOR) != 0) #define IEEE80211_IS_CHAN_FHSS(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS) #define IEEE80211_IS_CHAN_A(_c) \ @@ -241,10 +247,10 @@ struct ieee80211_channel { #define IEEE80211_IS_CHAN_QUARTER(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_QUARTER) != 0) -#define IEEE80211_IS_CHAN_RADAR(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_RADAR) != 0) #define IEEE80211_IS_CHAN_PASSIVE(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0) +#define IEEE80211_IS_CHAN_RADAR(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_RADAR) != 0) #define IEEE80211_ARE_CHANS_SAME_MODE(_a, _b) \ (((_a)->ic_flags & IEEE80211_CHAN_ALLTURBO) == ((_b)->ic_flags & IEEE80211_CHAN_ALLTURBO)) -- 2.35.1