diff options
| author | Stanislaw Gruszka | 2012-03-28 16:01:20 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-04-13 20:31:50 +0200 |
| commit | 5f5460706e5feaef286aacce37647f7e57d026e4 (patch) | |
| tree | cbea8989e8967cf5438328dede657b3dabc6fa4c /net/mac80211 | |
| parent | mac80211: do not scan and monitor connection in parallel (diff) | |
| download | kernel-qcow2-linux-5f5460706e5feaef286aacce37647f7e57d026e4.tar.gz kernel-qcow2-linux-5f5460706e5feaef286aacce37647f7e57d026e4.tar.xz kernel-qcow2-linux-5f5460706e5feaef286aacce37647f7e57d026e4.zip | |
mac80211: protect ->scanning by mutex in ieee80211_work_work()
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/work.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 1f74af33901b..b2650a9d45ff 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -122,9 +122,6 @@ static void ieee80211_work_work(struct work_struct *work) enum work_action rma; bool remain_off_channel = false; - if (local->scanning) - return; - /* * ieee80211_queue_work() should have picked up most cases, * here we'll pick the rest. @@ -134,6 +131,11 @@ static void ieee80211_work_work(struct work_struct *work) mutex_lock(&local->mtx); + if (local->scanning) { + mutex_unlock(&local->mtx); + return; + } + ieee80211_recalc_idle(local); list_for_each_entry_safe(wk, tmp, &local->work_list, list) { |