1 files changed, 8 insertions, 11 deletions

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 5f4f7869d050..74820656dc89 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -294,16 +294,13 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
         if (was_hw_scan)
                 goto done;
 
-        netif_tx_lock_bh(local->mdev);
-        netif_addr_lock(local->mdev);
+        spin_lock_bh(&local->filter_lock);
         local->filter_flags &= ~FIF_BCN_PRBRESP_PROMISC;
         drv_configure_filter(local, FIF_BCN_PRBRESP_PROMISC,
                              &local->filter_flags,
-                             local->mdev->mc_count,
-                             local->mdev->mc_list);
-
-        netif_addr_unlock(local->mdev);
-        netif_tx_unlock_bh(local->mdev);
+                             local->mc_count,
+                             local->mc_list);
+        spin_unlock_bh(&local->filter_lock);
 
         drv_sw_scan_complete(local);
 
@@ -382,13 +379,13 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
         local->scan_state = SCAN_SET_CHANNEL;
         local->scan_channel_idx = 0;
 
-        netif_addr_lock_bh(local->mdev);
+        spin_lock_bh(&local->filter_lock);
         local->filter_flags |= FIF_BCN_PRBRESP_PROMISC;
         drv_configure_filter(local, FIF_BCN_PRBRESP_PROMISC,
                              &local->filter_flags,
-                             local->mdev->mc_count,
-                             local->mdev->mc_list);
-        netif_addr_unlock_bh(local->mdev);
+                             local->mc_count,
+                             local->mc_list);
+        spin_unlock_bh(&local->filter_lock);
 
         /* TODO: start scan as soon as all nullfunc frames are ACKed */
         queue_delayed_work(local->hw.workqueue, &local->scan_work,