diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-15 13:59:53 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-15 13:59:53 -0500 |
| commit | ded652a67464b1fa66616954bc608ead9ec02fb6 (patch) | |
| tree | 7b4bf1ab3723ed6a906393a5c9f129381cf8e592 /net/mac80211/scan.c | |
| parent | b56e681b6210a635af4e4eb93ce81b4654851033 (diff) | |
| parent | 93c78c5debeb9c7101ecc73347d4730c26a98c05 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 6d0b89e4aa31..43a45cf00e06 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -351,6 +351,9 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) static bool ieee80211_can_scan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata) { + if (local->radar_detect_enabled) + return false; + if (!list_empty(&local->roc_list)) return false; |