summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-09-14 17:02:29 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-09-26 14:02:28 -0400
commit440c1c874a8e40a13fc2c799e05c469e1d67e9be (patch)
tree262fe8bc02076ffad48e45b1d0287e0c7fd19db4 /drivers
parent86c7d8d4168ce85cb9d880b247f941786ba0724b (diff)
downloadkernel-common-440c1c874a8e40a13fc2c799e05c469e1d67e9be.tar.gz
kernel-common-440c1c874a8e40a13fc2c799e05c469e1d67e9be.tar.bz2
kernel-common-440c1c874a8e40a13fc2c799e05c469e1d67e9be.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c4
1 files changed, 3 insertions, 1 deletions
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;
}
}
}