1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-28 17:48:58 +02:00

ath9k: fix an rx path race condition that might be the cause of the "ath: DMA failed to stop in 10 ms" logspam as well as various connection stability issues

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28202 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-09-09 07:20:44 +00:00
parent 1a1cc0d6d3
commit 749a54b34c

View File

@ -0,0 +1,34 @@
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1845,7 +1845,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
* If we're asked to flush receive queue, directly
* chain it back at the queue without processing it.
*/
- if (flush)
+ if (sc->sc_flags & SC_OP_RXFLUSH)
goto requeue_drop_frag;
retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
@@ -1973,7 +1973,8 @@ requeue:
} else {
list_move_tail(&bf->list, &sc->rx.rxbuf);
ath_rx_buf_link(sc, bf);
- ath9k_hw_rxena(ah);
+ if (!flush)
+ ath9k_hw_rxena(ah);
}
} while (1);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -246,8 +246,8 @@ static bool ath_prepare_reset(struct ath
if (!flush) {
if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- ath_rx_tasklet(sc, 0, true);
- ath_rx_tasklet(sc, 0, false);
+ ath_rx_tasklet(sc, 1, true);
+ ath_rx_tasklet(sc, 1, false);
} else {
ath_flushrecv(sc);
}