summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-10-06 11:22:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:30:42 -0400
commit4136c4224ccf1907d309e1cdfaefef9da97dbc5e (patch)
treebe65af6057850d068b7858f5679a00b64fb2e92d /net/mac80211/main.c
parente229f844d7223b7063bea1e649203ac521a58fe1 (diff)
downloadop-kernel-dev-4136c4224ccf1907d309e1cdfaefef9da97dbc5e.zip
op-kernel-dev-4136c4224ccf1907d309e1cdfaefef9da97dbc5e.tar.gz
mac80211: assure we also cancel deferred scan request
This is partial revert and fix for commit 85f72bc839705294b32b6c16b491c0422f0a71b3 "mac80211: only cancel software-based scans on suspend" When cfg80211 request the scan and mac80211 perform some management work, we defer the scan request. We do not canceling such requests when calling ieee80211_scan_cancel(), because of SCAN_SW_SCANNING bit check just before the call. So fix that problem. Another problem, which commit 85f72bc839705294b32b6c16b491c0422f0a71b3 tries to solve, is we can not cancel HW scan. Hence patch make ieee80211_scan_cancel() ignore HW scan (see code comments). Keeping local->mtx lock assures that the deferred scan will not become "working" HW scan. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e371709..915ecf8 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -307,8 +307,7 @@ static void ieee80211_restart_work(struct work_struct *work)
mutex_unlock(&local->mtx);
rtnl_lock();
- if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)))
- ieee80211_scan_cancel(local);
+ ieee80211_scan_cancel(local);
ieee80211_reconfig(local);
rtnl_unlock();
}
OpenPOWER on IntegriCloud