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>

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) {