[PATCH] zd1211rw: Don't handle broken frames in monitor mode

Using monitor mode, Johannes Berg observed out that lots of corrupted
and otherwise invalid frames were being passed to the host.

When in monitor mode we were disabling the hardware filtering here, but
this is not how monitor mode should work.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 19172f57152..6753d240c16 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -156,17 +156,8 @@ void zd_mac_clear(struct zd_mac *mac)
 static int reset_mode(struct zd_mac *mac)
 {
         struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
-        struct zd_ioreq32 ioreqs[] = {
-                { CR_RX_FILTER, STA_RX_FILTER },
-                { CR_SNIFFER_ON, 0U },
-        };
-
-        if (ieee->iw_mode == IW_MODE_MONITOR) {
-                ioreqs[0].value = 0xffffffff;
-                ioreqs[1].value = 0x1;
-        }
-
-        return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
+        u32 filter = (ieee->iw_mode == IW_MODE_MONITOR) ? ~0 : STA_RX_FILTER;
+        return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
 }
 
 int zd_mac_open(struct net_device *netdev)