summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFelix Fietkau2013-05-17 12:58:26 +0200
committerJohn W. Linville2013-05-17 20:31:09 +0200
commit6bb4880d9ef30375da4507aeabd6dc261a2c6c2b (patch)
treea486d8c32c78e1615c1aa4dac402de2eed7b11a6 /drivers/net
parentath9k: fix rate handling/reporting (diff)
downloadkernel-qcow2-linux-6bb4880d9ef30375da4507aeabd6dc261a2c6c2b.tar.gz
kernel-qcow2-linux-6bb4880d9ef30375da4507aeabd6dc261a2c6c2b.tar.xz
kernel-qcow2-linux-6bb4880d9ef30375da4507aeabd6dc261a2c6c2b.zip
ath9k: fix draining aggregation tid buffers
After a tx attempt, an A-MPDU subframe can still have fi->retries at 0 (if the retry count wasn't incremented due to powersave). In that case it is still tracked as part of the block ack window, so when draining the tid queue, its sequence number needs to be cleared from the pending frame bitmap. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index ad6e0b306c37..14bb3354ea64 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -287,9 +287,7 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
list_add_tail(&bf->list, &bf_head);
- if (fi->retries)
- ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
-
+ ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
}