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

diff --git a/net80211/_ieee80211.h b/net80211/_ieee80211.h
index e5ec72d0f8b9f31921cd4a82feaccb5773d79857..ce725313ef09f3404d73d91d5536ad106f41b003 100644 (file)
--- 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 7cb60c46ccad6283045ba2edac909a0ea4d6fe14..a7676c335e32486376197cb32d4298be778a7aaf 100644 (file)
--- 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