From: Felix Fietkau Date: Fri, 17 May 2013 10:58:26 +0000 (+0200) Subject: ath9k: fix draining aggregation tid buffers X-Git-Tag: MMI-PSA29.97-13-9~14175^2~34^2~41 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6bb4880d9ef30375da4507aeabd6dc261a2c6c2b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: John W. Linville --- 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); }