6 files changed, 17 insertions, 5 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index a6e9c89c802a..9abdfb84697c 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -290,7 +290,8 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
                            !(filter_flags & FIF_PROMISC_IN_BSS));
         rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
-                           !(filter_flags & FIF_PROMISC_IN_BSS));
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
         rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
         rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 1bdb873b65f2..54c9a75b549b 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -291,7 +291,8 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
                            !(filter_flags & FIF_PROMISC_IN_BSS));
         rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
-                           !(filter_flags & FIF_PROMISC_IN_BSS));
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
         rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
         rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,
                            !(filter_flags & FIF_ALLMULTI));
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index f5c18f011e93..28fdf191e956 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -337,7 +337,8 @@ static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME,
                            !(filter_flags & FIF_PROMISC_IN_BSS));
         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_TODS,
-                           !(filter_flags & FIF_PROMISC_IN_BSS));
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_VERSION_ERROR, 1);
         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_MULTICAST,
                            !(filter_flags & FIF_ALLMULTI));
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index a0adf5a04aa0..dc70e7aedfff 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -253,6 +253,13 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
          */
         rt2x00lib_config_intf(rt2x00dev, intf, conf->type, intf->mac, NULL);
 
+        /*
+         * Some filters depend on the current working mode. We can force
+         * an update during the next configure_filter() run by mac80211 by
+         * resetting the current packet_filter state.
+         */
+        rt2x00dev->packet_filter = 0;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_add_interface);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 0d2e6f7dd692..c5c625143335 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -342,7 +342,8 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
                            !(filter_flags & FIF_PROMISC_IN_BSS));
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
-                           !(filter_flags & FIF_PROMISC_IN_BSS));
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
                            !(filter_flags & FIF_ALLMULTI));
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index b3c846223432..796cf2990b72 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -354,7 +354,8 @@ static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
                            !(filter_flags & FIF_PROMISC_IN_BSS));
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
-                           !(filter_flags & FIF_PROMISC_IN_BSS));
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
                            !(filter_flags & FIF_ALLMULTI));