Эх сурвалжийг харах

mac80211_hwsim: do not actively scan DFS channels

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>
Johannes Berg 9 жил өмнө
parent
commit
a8e828deb3

+ 2 - 1
drivers/net/wireless/mac80211_hwsim.c

@@ -1871,7 +1871,8 @@ static void hw_scan_work(struct work_struct *work)
 		    req->channels[hwsim->scan_chan_idx]->center_freq);
 		    req->channels[hwsim->scan_chan_idx]->center_freq);
 
 
 	hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
 	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) {
 	    !req->n_ssids) {
 		dwell = 120;
 		dwell = 120;
 	} else {
 	} else {