1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index e20dd7431f21..3447997fc71a 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -530,7 +530,7 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
                            !(filter_flags & FIF_PLCPFAIL));
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
-                           !(filter_flags & FIF_CONTROL));
+                           !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
         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,
@@ -2624,6 +2624,12 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
                 return retval;
 
         /*
+         * This device has multiple filters for control frames,
+         * but has no a separate filter for PS Poll frames.
+         */
+        __set_bit(DRIVER_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags);
+
+        /*
          * This device requires firmware and DMA mapped skbs.
          */
         __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);