7 files changed, 20 insertions, 15 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 7b2a85ade135..e3cac0f26d7b 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1497,8 +1497,8 @@ static void rt2400pci_configure_filter(struct ieee80211_hw *hw,
          * - Some filters are set based on interface type.
          */
         *total_flags |= FIF_ALLMULTI;
-        if (changed_flags & FIF_OTHER_BSS ||
-            changed_flags & FIF_PROMISC_IN_BSS)
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
         if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
                 *total_flags |= FIF_PROMISC_IN_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 63a7b3cdf0cd..5d982316b854 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1830,8 +1830,8 @@ static void rt2500pci_configure_filter(struct ieee80211_hw *hw,
          */
         if (mc_count)
                 *total_flags |= FIF_ALLMULTI;
-        if (changed_flags & FIF_OTHER_BSS ||
-            changed_flags & FIF_PROMISC_IN_BSS)
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
         if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
                 *total_flags |= FIF_PROMISC_IN_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 973f653ecfc2..3dbd381f1428 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1602,8 +1602,8 @@ static void rt2500usb_configure_filter(struct ieee80211_hw *hw,
          */
         if (mc_count)
                 *total_flags |= FIF_ALLMULTI;
-        if (changed_flags & FIF_OTHER_BSS ||
-            changed_flags & FIF_PROMISC_IN_BSS)
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
         if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
                 *total_flags |= FIF_PROMISC_IN_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 82dfcd95bb26..9bb5fb964a21 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -410,8 +410,6 @@ struct rt2x00lib_ops {
          */
         void (*config_mac_addr) (struct rt2x00_dev *rt2x00dev, __le32 *mac);
         void (*config_bssid) (struct rt2x00_dev *rt2x00dev, __le32 *bssid);
-        void (*config_packet_filter) (struct rt2x00_dev *rt2x00dev,
-                                      const unsigned int filter);
         void (*config_type) (struct rt2x00_dev *rt2x00dev, const int type);
         void (*config) (struct rt2x00_dev *rt2x00dev, const unsigned int flags,
                         struct ieee80211_conf *conf);
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f25475318c9b..1e07c3938cb3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -276,11 +276,18 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
 {
         struct rt2x00_dev *rt2x00dev =
             container_of(work, struct rt2x00_dev, filter_work);
+        unsigned int filter = rt2x00dev->interface.filter;
+
+        /*
+         * Since we had stored the filter inside interface.filter,
+         * we should now clear that field. Otherwise the driver will
+         * assume nothing has changed (*total_flags will be compared
+         * to interface.filter to determine if any action is required).
+         */
+        rt2x00dev->interface.filter = 0;
 
         rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw,
-                                             rt2x00dev->interface.filter,
-                                             &rt2x00dev->interface.filter,
-                                             0, NULL);
+                                             filter, &filter, 0, NULL);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 5d31ced11149..588b22b16419 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2389,8 +2389,8 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
          */
         if (mc_count)
                 *total_flags |= FIF_ALLMULTI;
-        if (changed_flags & FIF_OTHER_BSS ||
-            changed_flags & FIF_PROMISC_IN_BSS)
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
         if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
                 *total_flags |= FIF_PROMISC_IN_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 5fa697bfaa14..6d1635b5cd07 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1856,8 +1856,8 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
          */
         if (mc_count)
                 *total_flags |= FIF_ALLMULTI;
-        if (changed_flags & FIF_OTHER_BSS ||
-            changed_flags & FIF_PROMISC_IN_BSS)
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
         if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
                 *total_flags |= FIF_PROMISC_IN_BSS;