diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-11-26 17:59:27 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-12-04 14:43:32 +0100 |
| commit | a8e828deb393e8a5ca84cd3d0df56b3c0be04607 (patch) | |
| tree | c2edaf1e3bb7b67eeaf5bb427deb52d83d7119eb | |
| parent | c781944b71f87aa4d30eaaafb4e7573ce94bdcfd (diff) | |
| download | op-kernel-dev-a8e828deb393e8a5ca84cd3d0df56b3c0be04607.zip op-kernel-dev-a8e828deb393e8a5ca84cd3d0df56b3c0be04607.tar.gz | |
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>
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index c00a7daaa..aaf1b3e 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/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); 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 { |
