]> Pileus Git - ~andy/linux/commitdiff
ath9k: do not link bf_next across multiple A-MPDUs
authorFelix Fietkau <nbd@openwrt.org>
Sat, 14 Sep 2013 15:02:29 +0000 (17:02 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Sep 2013 18:02:28 +0000 (14:02 -0400)
This might trip up tx completion processing, although the condition that
triggers this should not (yet) occur in practice.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/xmit.c

index a749e0f5ab549486dc74d457480120bd75d95c11..58499603f70506c1e046312ef529a920464f482d 100644 (file)
@@ -1951,7 +1951,9 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
                        if (bf_is_ampdu_not_probing(bf))
                                txq->axq_ampdu_depth++;
 
-                       bf = bf->bf_lastbf->bf_next;
+                       bf_last = bf->bf_lastbf;
+                       bf = bf_last->bf_next;
+                       bf_last->bf_next = NULL;
                }
        }
 }