AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mac80211: fix sw scan locking

Browse Source 
The recent scan overhaul broke locking
because now we can jump to code that
attempts to unlock, while we don't have
the mutex held. Fix this by holding the
mutex around all the relevant code.

Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2010-10-07 12:55:24 +02:00 committed by John W. Linville
parent 4b34d432b0
commit 7b99a7c2da
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/scan.c
View File

@ -681,8 +681,6 @@ void ieee80211_scan_work(struct work_struct *work)
goto out_complete;
}
mutex_unlock(&local->mtx);
/*
* as long as no delay is required advance immediately
* without scheduling a new work
@ -713,6 +711,7 @@ void ieee80211_scan_work(struct work_struct *work)
} while (next_delay == 0);
ieee80211_queue_delayed_work(&local->hw, &local->scan_work, next_delay);
mutex_unlock(&local->mtx);
return;
out_complete: