diff options
| author | Eliad Peller <eliad@wizery.com> | 2015-01-07 10:50:11 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-14 03:37:07 -0500 |
| commit | 2726f23d2d3775668f00b9a884eb88cd8812917c (patch) | |
| tree | 39e895d887f9aaabdec90105bc04ecf0a75ca815 /net/mac80211 | |
| parent | e7f2337ae70e0cdaac577c5a4823775097d0e9e7 (diff) | |
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')
| -rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 505 | 505 | ||
| 506 | lockdep_assert_held(&local->mtx); | 506 | lockdep_assert_held(&local->mtx); |
| 507 | 507 | ||
| 508 | if (local->scan_req) | 508 | if (local->scan_req || ieee80211_is_radar_required(local)) |
| 509 | return -EBUSY; | 509 | return -EBUSY; |
| 510 | 510 | ||
| 511 | if (!ieee80211_can_scan(local, sdata)) { | 511 | if (!ieee80211_can_scan(local, sdata)) { |