Skip to contentSkip to conversation

rtlwifi: Fix logic in rx_interrupt

PATCH In review Mike McCormack 2 participants 2 messages May 23, 2011 Networking drivers (wireless)

lore
Share & tools
lore

Mike McCormack

author
#0 lore raw

PATCH 8/8 rtlwifi: Fix logic in rx_interrupt

Should pass along packet if there's no CRC and no hardware error.

Signed-off-by Mike McCormack <[email protected]>
---
 drivers/net/wireless/rtlwifi/pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/rtlwifi/pci.c +1 -1
index 4fe405a..215abfa 100644
@@ -691,7 +691,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 			hdr = rtl_get_hdr(skb);
 			fc = rtl_get_fc(skb);
 
-			if (!stats.crc || !stats.hwerror) {
+			if (!stats.crc && !stats.hwerror) {
 				memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
 				       sizeof(rx_status));
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 12 lines · Mike McCormack

Should pass along packet if there's no CRC and no hardware error.

Signed-off-by Mike McCormack<[email protected]>
---
  drivers/net/wireless/rtlwifi/pci.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/rtlwifi/pci.c +0 -0
index 4fe405a..215abfa 100644

drivers/net/wireless/rtlwifi/pci.c static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) · line 697

Quoted 8 lines
drivers/net/wireless/rtlwifi/pci.c +1 -1
@@ -691,7 +691,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
  			hdr = rtl_get_hdr(skb);
  			fc = rtl_get_fc(skb);
 
-			if (!stats.crc || !stats.hwerror) {
+			if (!stats.crc&&  !stats.hwerror) {
  				memcpy(IEEE80211_SKB_RXCB(skb),&rx_status,
  				       sizeof(rx_status));

Good catch.

Signed-off-by Larry Finger <[email protected]>

---

Larry