From cf73167868cbb17af73897616fca0fe66db6334c Mon Sep 17 00:00:00 2001 From: proski Date: Tue, 20 Nov 2007 17:33:41 +0000 Subject: [PATCH] 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 --- net80211/_ieee80211.h | 5 +++++ tools/wlanconfig.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net80211/_ieee80211.h b/net80211/_ieee80211.h index e5ec72d..ce72531 100644 --- a/net80211/_ieee80211.h +++ b/net80211/_ieee80211.h @@ -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)) diff --git a/tools/wlanconfig.c b/tools/wlanconfig.c index 7cb60c4..a7676c3 100644 --- a/tools/wlanconfig.c +++ b/tools/wlanconfig.c @@ -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 -- 2.35.1