From: Felix Fietkau Date: Tue, 11 Jan 2011 00:05:47 +0000 (-0700) Subject: ath9k: fix bogus sequence number increases on aggregation tid flush X-Git-Tag: v2.6.39-rc1~468^2~448^2~56 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a9e99a0cea3b6e27cca23ad2ef57331a25d886bb;p=~shefty%2Frdma-dev.git ath9k: fix bogus sequence number increases on aggregation tid flush When a tid pointer is passed to ath_tx_send_normal(), it increases the starting sequence number for the next AMPDU action frame, which should only be done if the sequence number assignment is fresh. In this case it is clearly not. 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 332d1feb5c1..1adfebcd9b9 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -169,7 +169,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) ath_tx_update_baw(sc, tid, fi->seqno); ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0); } else { - ath_tx_send_normal(sc, txq, tid, &bf_head); + ath_tx_send_normal(sc, txq, NULL, &bf_head); } spin_lock_bh(&txq->axq_lock); }