summaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2015-01-07 17:50:11 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-01-14 09:37:07 +0100
commit2726f23d2d3775668f00b9a884eb88cd8812917c (patch)
tree39e895d887f9aaabdec90105bc04ecf0a75ca815 /net/mac80211/scan.c
parente7f2337ae70e0cdaac577c5a4823775097d0e9e7 (diff)
downloadop-kernel-dev-2726f23d2d3775668f00b9a884eb88cd8812917c.zip
op-kernel-dev-2726f23d2d3775668f00b9a884eb88cd8812917c.tar.gz
mac80211: don't defer scans in case of radar detection
Radar detection can last indefinite time. There is no point in deferring a scan request in this case - simply return -EBUSY. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index b0320bb..7807fa4 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -505,7 +505,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
lockdep_assert_held(&local->mtx);
- if (local->scan_req)
+ if (local->scan_req || ieee80211_is_radar_required(local))
return -EBUSY;
if (!ieee80211_can_scan(local, sdata)) {
OpenPOWER on IntegriCloud