nexmon – Blame information for rev 1
?pathlinks?
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 1 | office | 1 | diff -pur drivers/net/wireless/zd1211rw/zd_mac.c.orig drivers/net/wireless/zd1211rw/zd_mac.c |
| 2 | --- drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-07-20 19:44:42.000000000 +0200 |
||
| 3 | +++ drivers/net/wireless/zd1211rw/zd_mac.c 2008-07-20 19:49:24.000000000 +0200 |
||
| 4 | @@ -159,14 +159,19 @@ void zd_mac_clear(struct zd_mac *mac) |
||
| 5 | static int set_rx_filter(struct zd_mac *mac) |
||
| 6 | { |
||
| 7 | unsigned long flags; |
||
| 8 | - u32 filter = STA_RX_FILTER; |
||
| 9 | + struct zd_ioreq32 ioreqs[] = { |
||
| 10 | + {CR_RX_FILTER, STA_RX_FILTER}, |
||
| 11 | + { CR_SNIFFER_ON, 0U }, |
||
| 12 | + }; |
||
| 13 | |||
| 14 | spin_lock_irqsave(&mac->lock, flags); |
||
| 15 | - if (mac->pass_ctrl) |
||
| 16 | - filter |= RX_FILTER_CTRL; |
||
| 17 | + if (mac->pass_ctrl) { |
||
| 18 | + ioreqs[0].value |= 0xFFFFFFFF; |
||
| 19 | + ioreqs[1].value = 0x1; |
||
| 20 | + } |
||
| 21 | spin_unlock_irqrestore(&mac->lock, flags); |
||
| 22 | |||
| 23 | - return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter); |
||
| 24 | + return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs)); |
||
| 25 | } |
||
| 26 | |||
| 27 | static int set_mc_hash(struct zd_mac *mac) |
||
| 28 | @@ -679,7 +684,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, c |
||
| 29 | /* Caller has to ensure that length >= sizeof(struct rx_status). */ |
||
| 30 | status = (struct rx_status *) |
||
| 31 | (buffer + (length - sizeof(struct rx_status))); |
||
| 32 | - if (status->frame_status & ZD_RX_ERROR) { |
||
| 33 | + if ((status->frame_status & ZD_RX_ERROR) || |
||
| 34 | + (status->frame_status & ~0x21)) { |
||
| 35 | if (mac->pass_failed_fcs && |
||
| 36 | (status->frame_status & ZD_RX_CRC32_ERROR)) { |
||
| 37 | stats.flag |= RX_FLAG_FAILED_FCS_CRC; |