Commit 0a45da76 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

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

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ca42627
...@@ -100,6 +100,9 @@ static bool ath9k_rx_accept(struct ath_common *common, ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment