1 files changed, 18 insertions, 8 deletions

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 3f0a2faf37d4..17455c6a5229 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2662,10 +2662,16 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
                 printk(KERN_DEBUG "%s: failed to restore operational"
                        "channel after scan\n", dev->name);
 
-        if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) &&
-            ieee80211_if_config(dev))
-                printk(KERN_DEBUG "%s: failed to restore operational"
-                       "BSSID after scan\n", dev->name);
+
+        netif_tx_lock_bh(local->mdev);
+        local->filter_flags &= ~FIF_BCN_PRBRESP_PROMISC;
+        local->ops->configure_filter(local_to_hw(local),
+                                     FIF_BCN_PRBRESP_PROMISC,
+                                     &local->filter_flags,
+                                     local->mdev->mc_count,
+                                     local->mdev->mc_list);
+
+        netif_tx_unlock_bh(local->mdev);
 
         memset(&wrqu, 0, sizeof(wrqu));
         wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
@@ -2849,10 +2855,14 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
         local->scan_channel_idx = 0;
         local->scan_dev = dev;
 
-        if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) &&
-            ieee80211_if_config(dev))
-                printk(KERN_DEBUG "%s: failed to set BSSID for scan\n",
-                       dev->name);
+        netif_tx_lock_bh(local->mdev);
+        local->filter_flags |= FIF_BCN_PRBRESP_PROMISC;
+        local->ops->configure_filter(local_to_hw(local),
+                                     FIF_BCN_PRBRESP_PROMISC,
+                                     &local->filter_flags,
+                                     local->mdev->mc_count,
+                                     local->mdev->mc_list);
+        netif_tx_unlock_bh(local->mdev);
 
         /* TODO: start scan as soon as all nullfunc frames are ACKed */
         queue_delayed_work(local->hw.workqueue, &local->scan_work,