aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 1232ba25e1e9..d7c371e36bf0 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4064,16 +4064,14 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
4064 local->scan_band = IEEE80211_BAND_2GHZ; 4064 local->scan_band = IEEE80211_BAND_2GHZ;
4065 local->scan_dev = dev; 4065 local->scan_dev = dev;
4066 4066
4067 netif_tx_lock_bh(local->mdev); 4067 netif_addr_lock_bh(local->mdev);
4068 netif_addr_lock(local->mdev);
4069 local->filter_flags |= FIF_BCN_PRBRESP_PROMISC; 4068 local->filter_flags |= FIF_BCN_PRBRESP_PROMISC;
4070 local->ops->configure_filter(local_to_hw(local), 4069 local->ops->configure_filter(local_to_hw(local),
4071 FIF_BCN_PRBRESP_PROMISC, 4070 FIF_BCN_PRBRESP_PROMISC,
4072 &local->filter_flags, 4071 &local->filter_flags,
4073 local->mdev->mc_count, 4072 local->mdev->mc_count,
4074 local->mdev->mc_list); 4073 local->mdev->mc_list);
4075 netif_addr_unlock(local->mdev); 4074 netif_addr_unlock_bh(local->mdev);
4076 netif_tx_unlock_bh(local->mdev);
4077 4075
4078 /* TODO: start scan as soon as all nullfunc frames are ACKed */ 4076 /* TODO: start scan as soon as all nullfunc frames are ACKed */
4079 queue_delayed_work(local->hw.workqueue, &local->scan_work, 4077 queue_delayed_work(local->hw.workqueue, &local->scan_work,