mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tools/wlanconfig.c changes from the DFS branch 

IEEE80211_IS_CHAN_RADAR and IEEE80211_IS_CHAN_PASSIVE should be in the
headers, not in wlanconfig.c


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2866 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2007-11-20 17:33:41 +00:00
parent a08cab1f36
commit cf73167868
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net80211/_ieee80211.h
View File

@ -214,6 +214,11 @@ 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)
/* ni_chan encoding for FH phy */
#define IEEE80211_FH_CHANMOD 80
#define IEEE80211_FH_CHAN(set,pat) (((set) - 1) * IEEE80211_FH_CHANMOD + (pat))

6
tools/wlanconfig.c
View File

@ -694,11 +694,8 @@ list_scan(const char *ifname)
static void
print_chaninfo(const struct ieee80211_channel *c)
{
#define IEEE80211_IS_CHAN_PASSIVE(_c) \
(((_c)->ic_flags & IEEE80211_CHAN_PASSIVE))
#define IEEE80211_IS_CHAN_RADAR(_c) \
(((_c)->ic_flags & IEEE80211_CHAN_RADAR) != 0)
char buf[14];
buf[0] = '\0';
if (IEEE80211_IS_CHAN_FHSS(c))
strlcat(buf, " FHSS", sizeof(buf));
@ -723,7 +720,6 @@ print_chaninfo(const struct ieee80211_channel *c)
IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
IEEE80211_IS_CHAN_RADAR(c) ? '!' : ' ',
buf);
#undef IEEE80211_IS_CHAN_PASSIVE
}
static void