ath9k: fix ready time of the multicast buffer queue
authorFelix Fietkau <nbd@openwrt.org>
Sun, 9 Mar 2014 10:02:54 +0000 (11:02 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 Apr 2014 15:23:22 +0000 (16:23 +0100)
commit 3b3e0efb5c72c4fc940af50b33626b8a78a907dc upstream.

qi->tqi_readyTime is written directly to registers that expect
microseconds as unit instead of TU.
When setting the CABQ ready time, cur_conf->beacon_interval is in TU, so
convert it to microseconds before passing it to ath9k_hw.

This should hopefully fix some Tx DMA issues with buffered multicast
frames in AP mode.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/wireless/ath/ath9k/xmit.c

index 2e88af1..a0ba5ac 100644 (file)
@@ -1390,7 +1390,7 @@ int ath_cabq_update(struct ath_softc *sc)
        else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND)
                sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND;
 
-       qi.tqi_readyTime = (cur_conf->beacon_interval *
+       qi.tqi_readyTime = (TU_TO_USEC(cur_conf->beacon_interval) *
                            sc->config.cabqReadytime) / 100;
        ath_txq_update(sc, qnum, &qi);