From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 14 Sep 2013 15:02:29 +0000 (+0200)
Subject: ath9k: do not link bf_next across multiple A-MPDUs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=440c1c874a8e40a13fc2c799e05c469e1d67e9be;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ath9k: do not link bf_next across multiple A-MPDUs

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>
---

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index a749e0f5ab54..58499603f705 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -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;
 		}
 	}
 }