nexmon – Rev 1

Subversion Repositories:
Rev:
diff -pur drivers/net/wireless/zd1211rw/zd_mac.c.orig drivers/net/wireless/zd1211rw/zd_mac.c
--- drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-07-20 19:44:42.000000000 +0200
+++ drivers/net/wireless/zd1211rw/zd_mac.c      2008-07-20 19:49:24.000000000 +0200
@@ -159,14 +159,19 @@ void zd_mac_clear(struct zd_mac *mac)
 static int set_rx_filter(struct zd_mac *mac)
 {
        unsigned long flags;
-       u32 filter = STA_RX_FILTER;
+       struct zd_ioreq32 ioreqs[] = {
+               {CR_RX_FILTER, STA_RX_FILTER},
+               { CR_SNIFFER_ON, 0U },
+       };
 
        spin_lock_irqsave(&mac->lock, flags);
-       if (mac->pass_ctrl)
-               filter |= RX_FILTER_CTRL;
+       if (mac->pass_ctrl) {
+               ioreqs[0].value |= 0xFFFFFFFF;
+               ioreqs[1].value = 0x1;
+       }
        spin_unlock_irqrestore(&mac->lock, flags);
 
-       return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
+       return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
 }
 
 static int set_mc_hash(struct zd_mac *mac)
@@ -679,7 +684,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, c
        /* Caller has to ensure that length >= sizeof(struct rx_status). */
        status = (struct rx_status *)
                (buffer + (length - sizeof(struct rx_status)));
-       if (status->frame_status & ZD_RX_ERROR) {
+       if ((status->frame_status & ZD_RX_ERROR) || 
+               (status->frame_status & ~0x21)) {
                if (mac->pass_failed_fcs &&
                                (status->frame_status & ZD_RX_CRC32_ERROR)) {
                        stats.flag |= RX_FLAG_FAILED_FCS_CRC;