mac80211: fix sw scan locking

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>

1 files changed, 1 insertions, 2 deletions

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 523db930dabb..fb274db77e3c 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -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: