aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2010-08-15 13:03:13 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:28:01 -0400
commit23538c268c834d73a2f3e65a06ea6bf218ba1a0e (patch)
treedd93c3f682449649a8c1b540702c4917317bbefe
parenta180a13081708b78d42232c6d922ce3de63f12e0 (diff)
ath5k: remove monitor check in receive_frame_ok filter
Monitor interfaces are never seen by the driver, so tests based on that opmode don't make sense. Also, we already pass all mic failure packets. Consequently this code is actually accepting any frames with just crypto errors and rejecting those with CRC, FIFO, and PHY errors for all interface types. Adjust the code and comment accordingly. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index c3b614d2ef34..166029913884 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2035,9 +2035,8 @@ ath5k_receive_frame_ok(struct ath5k_softc *sc, struct ath5k_rx_status *rs)
2035 return true; 2035 return true;
2036 } 2036 }
2037 2037
2038 /* let crypto-error packets fall through in MNTR */ 2038 /* reject any frames with non-crypto errors */
2039 if ((rs->rs_status & ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) || 2039 if (rs->rs_status & ~(AR5K_RXERR_DECRYPT))
2040 sc->opmode != NL80211_IFTYPE_MONITOR)
2041 return false; 2040 return false;
2042 } 2041 }
2043 2042