aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/carl9170/rx.c
diff options
context:
space:
mode:
authorChristian Lamparter2010-10-09 22:23:37 +0200
committerJohn W. Linville2010-10-11 15:04:22 -0400
commit9f59f3c694c184c69e0be7d0fd0829bcb61b0429 (patch)
tree4cefd4fa1d2a66ce21373302f61d1a93956324d4 /drivers/net/wireless/ath/carl9170/rx.c
parentc8a16c68ef4eb7817e41759c7105678ebc155377 (diff)
carl9170: remove stale rx error path
The total/fatal error bit was erroneously prefixed with AR9170_RX_ERROR instead of AR9170_RX_STATUS. Luckily, the hardware specification confirmed that the 0x80 flag will never be set for mac->error. So, it was always just a dead branch. This patch also imports the latest version of shared wlan.h header from the firmware git. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/rx.c')
-rw-r--r--drivers/net/wireless/ath/carl9170/rx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 31287e0d362f..256dd42bb4ab 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -604,9 +604,6 @@ static void carl9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
mpdu_len = len - sizeof(*mac);
mac = (void *)(buf + mpdu_len);
- if (unlikely(mac->error & AR9170_RX_ERROR_FATAL))
- goto drop;
-
switch (mac->status & AR9170_RX_STATUS_MPDU) {
case AR9170_RX_STATUS_MPDU_FIRST:
/* Aggregated MPDUs start with an PLCP header */