Merge tools/wlanconfig.c changes from the DFS branch

[madwifi/.git] / tools / wlanconfig.c

diff --git a/tools/wlanconfig.c b/tools/wlanconfig.c
index 3a08ee3199817d95fc637cf704b272ce817fc7cb..a7676c335e32486376197cb32d4298be778a7aaf 100644 (file)
--- a/tools/wlanconfig.c
+++ b/tools/wlanconfig.c
@@ -694,8 +694,6 @@ 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))
        char buf[14];
 
        buf[0] = '\0';
@@ -713,10 +711,15 @@ print_chaninfo(const struct ieee80211_channel *c)
                strlcat(buf, " Static", sizeof(buf));
        if (IEEE80211_IS_CHAN_DTURBO(c))
                strlcat(buf, " Dynamic", sizeof(buf));
-       printf("Channel %3u : %u%c Mhz%-14.14s",
+       if (IEEE80211_IS_CHAN_HALF(c))
+               strlcat(buf, " Half", sizeof(buf));
+       if (IEEE80211_IS_CHAN_QUARTER(c))
+               strlcat(buf, " Quarter", sizeof(buf));
+       printf("Channel %3u : %u%c%c Mhz%-14.14s",
                c->ic_ieee, c->ic_freq,
-               IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', buf);
-#undef IEEE80211_IS_CHAN_PASSIVE
+               IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', 
+               IEEE80211_IS_CHAN_RADAR(c) ? '!' : ' ', 
+              buf);
 }
 
 static void