1 files changed, 55 insertions, 2 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 0a11c27d603b..17b6bb034ebf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -380,6 +380,50 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_config_interface);
 
+void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
+                                unsigned int changed_flags,
+                                unsigned int *total_flags,
+                                int mc_count, struct dev_addr_list *mc_list)
+{
+        struct rt2x00_dev *rt2x00dev = hw->priv;
+
+        /*
+         * Mask off any flags we are going to ignore
+         * from the total_flags field.
+         */
+        *total_flags &=
+            FIF_ALLMULTI |
+            FIF_FCSFAIL |
+            FIF_PLCPFAIL |
+            FIF_CONTROL |
+            FIF_OTHER_BSS |
+            FIF_PROMISC_IN_BSS;
+
+        /*
+         * Apply some rules to the filters:
+         * - Some filters imply different filters to be set.
+         * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
+         */
+        *total_flags |= FIF_ALLMULTI;
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
+                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
+
+        /*
+         * Check if there is any work left for us.
+         */
+        if (rt2x00dev->packet_filter == *total_flags)
+                return;
+        rt2x00dev->packet_filter = *total_flags;
+
+        if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
+        else
+                rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
+}
+EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);
+
 int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats)
 {
@@ -419,6 +463,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct rt2x00_intf *intf = vif_to_intf(vif);
+        unsigned int delayed = 0;
 
         /*
          * When the association status has changed we must reset the link
@@ -439,11 +484,19 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
          * When the erp information has changed, we should perform
          * additional configuration steps. For all other changes we are done.
          */
-        if (changes & BSS_CHANGED_ERP_PREAMBLE)
-                rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);
+        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+                if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+                        rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);
+                else
+                        delayed |= DELAYED_CONFIG_ERP;
+        }
 
         spin_lock(&intf->lock);
         memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
+        if (delayed) {
+                intf->delayed_flags |= delayed;
+                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
+        }
         spin_unlock(&intf->lock);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);