lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: move the rx_stats->rs_datalen check to ath9k_rx_accept()

Browse Source 
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez
2009-11-04 08:58:45 -08:00
committed by John W. Linville
parent 5ca42627f3
commit 0a45da765e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ath/ath9k/recv.c
View File

@@ -100,6 +100,9 @@ static bool ath9k_rx_accept(struct ath_common *common,
hdr = (struct ieee80211_hdr *) skb->data; hdr = (struct ieee80211_hdr *) skb->data;
fc = hdr->frame_control; fc = hdr->frame_control;
if (!rx_stats->rs_datalen)
return false;
if (rx_stats->rs_more) { if (rx_stats->rs_more) {
/* /*
* Frame spans multiple descriptors; this cannot happen yet * Frame spans multiple descriptors; this cannot happen yet
@@ -793,9 +796,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
if (flush) if (flush)
goto requeue; goto requeue;
if (!rx_stats->rs_datalen)
goto requeue;
/* The status portion of the descriptor could get corrupted. */ /* The status portion of the descriptor could get corrupted. */
if (sc->rx.bufsize < rx_stats->rs_datalen) if (sc->rx.bufsize < rx_stats->rs_datalen)
goto requeue; goto requeue;