Make use of the IEEE80211_IS_CHAN_RADAR macro

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4074 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index ea21c5f2af8f53724e9d9586a9442b6d5ac9c29d..b3ac8e861637c99e17cf118e7485f8dfb75cdb5d 100644 (file)
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -893,7 +893,7 @@ ieee80211_expire_excl_restrictions(struct ieee80211com *ic)
        do_gettimeofday(&tv_now);
        for (i = 0; i < ic->ic_nchans; i++) {
                c = &ic->ic_channels[i];
-               if (c->ic_flags & IEEE80211_CHAN_RADAR) {
+               if (IEEE80211_IS_CHAN_RADAR(c)) {
                        if (timeval_compare(&ic->ic_chan_non_occupy[i],
                                            &tv_now) < 0) {
                                if_printf(dev,
@@ -938,7 +938,7 @@ ieee80211_update_dfs_excl_timer(struct ieee80211com *ic)
        tv_next.tv_usec = 0;
        for (i = 0; i < ic->ic_nchans; i++) {
                chan = &ic->ic_channels[i];
-               if (chan->ic_flags & IEEE80211_CHAN_RADAR) {
+               if (IEEE80211_IS_CHAN_RADAR(chan)) {
                        if ((tv_next.tv_sec == 0) &&
                            (tv_next.tv_usec == 0)) {
                                tv_next = ic->ic_chan_non_occupy[i];
@@ -1005,8 +1005,7 @@ ieee80211_expire_dfs_excl_timer(unsigned long data)
                                                                ic_freq,
                                                        vap->iv_des_chan->
                                                                ic_flags);
-                               } else if (!(des_chan->ic_flags &
-                                                       IEEE80211_CHAN_RADAR)) {
+                               } else if (!IEEE80211_IS_CHAN_RADAR(des_chan)) {
                                        IEEE80211_DPRINTF(vap, 
                                                        IEEE80211_MSG_DOTH,
                                                        "%s: Desired channel "

diff --git a/net80211/ieee80211_scan.c b/net80211/ieee80211_scan.c
index 9ed6c158aa634dc571fe905b78cc1b0dd9f1003b..d7ba734f55755b4b093e495d9e53376b711674d1 100644 (file)
--- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c
@@ -1066,8 +1066,7 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
                /* Search for the first channel with no radar detected */
                int n = 0;
                for (n = 0; n < ic->ic_nchans; n++) {
-                       if (0 == (ic->ic_channels[n].ic_flags &
-                                               IEEE80211_CHAN_RADAR)) {
+                       if (!IEEE80211_IS_CHAN_RADAR(&ic->ic_channels[n])) {
                                new_channel = &ic->ic_channels[n];
                                break;
                        }

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
index 12cabf8634892c47270093c6719c76a5aea2513d..eb19f66b7a33f0d33cffeb1fb94bef3c3adef022 100644 (file)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -730,7 +730,7 @@ ieee80211_ioctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
                        return 0;                       /* no change, return */
 
                /* Don't allow to change to channel with radar found */
-               if (c->ic_flags & IEEE80211_CHAN_RADAR)
+               if (IEEE80211_IS_CHAN_RADAR(c))
                        return -EINVAL;
 
                /*