From: Eliad Peller <eliad@wizery.com>
Date: Wed, 7 Jan 2015 15:50:11 +0000 (+0200)
Subject: mac80211: don't defer scans in case of radar detection
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2726f23d2d3775668f00b9a884eb88cd8812917c;p=linux-beck.git

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>
---

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index b0320bb20ab8..7807fa42ed3f 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)) {