diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-11-04 11:58:45 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 17:09:07 -0500 |
commit | 0a45da765e4bf5e8a7705266fa36e0f44787b0a1 (patch) | |
tree | a45ef59859b65b73a185e2ad18a191f9c711e61c | |
parent | 5ca42627f3ddc0e4fc3e62d879cc35ab5beaaa8b (diff) |
ath9k: move the rx_stats->rs_datalen check to ath9k_rx_accept()
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 079361423efc..4420a5800bd6 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -100,6 +100,9 @@ static bool ath9k_rx_accept(struct ath_common *common, | |||
100 | hdr = (struct ieee80211_hdr *) skb->data; | 100 | hdr = (struct ieee80211_hdr *) skb->data; |
101 | fc = hdr->frame_control; | 101 | fc = hdr->frame_control; |
102 | 102 | ||
103 | if (!rx_stats->rs_datalen) | ||
104 | return false; | ||
105 | |||
103 | if (rx_stats->rs_more) { | 106 | if (rx_stats->rs_more) { |
104 | /* | 107 | /* |
105 | * Frame spans multiple descriptors; this cannot happen yet | 108 | * Frame spans multiple descriptors; this cannot happen yet |
@@ -793,9 +796,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
793 | if (flush) | 796 | if (flush) |
794 | goto requeue; | 797 | goto requeue; |
795 | 798 | ||
796 | if (!rx_stats->rs_datalen) | ||
797 | goto requeue; | ||
798 | |||
799 | /* The status portion of the descriptor could get corrupted. */ | 799 | /* The status portion of the descriptor could get corrupted. */ |
800 | if (sc->rx.bufsize < rx_stats->rs_datalen) | 800 | if (sc->rx.bufsize < rx_stats->rs_datalen) |
801 | goto requeue; | 801 | goto requeue; |