More whitespace cleanup backported from madwifi-dfs

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

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
index e20ca5f55791b9b3725b0e5c71c706b58d8801d4..a24a55b44709c7244db0c46e4a8c76fbba73b4dd 100644 (file)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -756,13 +756,15 @@ ieee80211_ioctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
                if (vap->iv_state == IEEE80211_S_RUN) {
                        ic->ic_set_channel(ic);
                }
-       } else if(vap->iv_opmode == IEEE80211_M_HOSTAP) {
+       } else if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
                /* Need to use channel switch announcement on beacon if we are 
                 * up and running.  We use ic_set_channel directly if we are 
                 * "running" but not "up".  Otherwise, iv_des_chan will take
                 * effect when we are transitioned to RUN state later. */
-               if(IS_UP(vap->iv_dev)) {
-                       pre_announced_chanswitch(dev, ieee80211_chan2ieee(ic, vap->iv_des_chan), IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT);
+               if (IS_UP(vap->iv_dev) &&
+                   (0 == (vap->iv_des_chan->ic_flags & CHANNEL_DFS))) {
+                       pre_announced_chanswitch(dev, ieee80211_chan2ieee(ic, vap->iv_des_chan),
+                               IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT);
                }
                else if (vap->iv_state == IEEE80211_S_RUN) {
                        ic->ic_curchan = vap->iv_des_chan;