mac80211_hwsim: do not actively scan DFS channels
authorJohannes Berg <johannes.berg@intel.com>
Thu, 26 Nov 2015 16:59:27 +0000 (17:59 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 4 Dec 2015 13:43:32 +0000 (14:43 +0100)
We had another change to fix this in mac80211, but the hwsim
"hardware" scan should also be fixed. Obviously this one isn't
important since it's not real hardware, but we'd better be
consistent.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c

index c00a7daaa4bc7be08c290cb2f159fb2e3a0ff19c..aaf1b3e860bf11af075aafbb7b488203ff5a7955 100644 (file)
@@ -1871,7 +1871,8 @@ static void hw_scan_work(struct work_struct *work)
                    req->channels[hwsim->scan_chan_idx]->center_freq);
 
        hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
-       if (hwsim->tmp_chan->flags & IEEE80211_CHAN_NO_IR ||
+       if (hwsim->tmp_chan->flags & (IEEE80211_CHAN_NO_IR |
+                                     IEEE80211_CHAN_RADAR) ||
            !req->n_ssids) {
                dwell = 120;
        } else {