adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

mac80211: fix scan abort sanity checks

Browse source 
Since sometimes mac80211 queues up a scan request
to only act on it later, it must be allowed to
(internally) cancel a not-yet-running scan, e.g.
when the interface is taken down. This condition
was missing since we always checked only the
local->scanning variable which isn't yet set in
that situation.

Reported-by: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-10-31 07:44:08 +01:00 committed by John W. Linville
parent 1933ac4d93
commit 6d3560d4fc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/mac80211/scan.c
View file

@ -288,10 +288,14 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
mutex_lock(&local->scan_mtx); mutex_lock(&local->scan_mtx);
if (WARN_ON(!local->scanning)) { /*
mutex_unlock(&local->scan_mtx); * It's ok to abort a not-yet-running scan (that
return; * we have one at all will be verified by checking
} * local->scan_req next), but not to complete it
* successfully.
*/
if (WARN_ON(!local->scanning && !aborted))
aborted = true;
if (WARN_ON(!local->scan_req)) { if (WARN_ON(!local->scan_req)) {
mutex_unlock(&local->scan_mtx); mutex_unlock(&local->scan_mtx);