aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2006-02-15 18:12:24 +0000
committerSam Leffler <sam@FreeBSD.org>2006-02-15 18:12:24 +0000
commit1539af1ef5b902e8c105c6ed08a3b3c39258ede8 (patch)
treeda25c700be689222c1c9e2c836fe9ae45fcdc2df
parent14d5e8363fda968354e29d85ce4bb51ac5b5bc1f (diff)
downloadsrc-1539af1ef5b902e8c105c6ed08a3b3c39258ede8.tar.gz
src-1539af1ef5b902e8c105c6ed08a3b3c39258ede8.zip
close race between ath_tx_start and ath_tx_processq
Reviewed by: apatti MFC after: 1 week
Notes
Notes: svn path=/head/; revision=155729
-rw-r--r--sys/dev/ath/if_ath.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index f0704279d8ef..c0cb1500b606 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -3766,7 +3766,6 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
txq->axq_intrcnt = 0; /* reset periodic desc intr count */
bf = STAILQ_FIRST(&txq->axq_q);
if (bf == NULL) {
- txq->axq_link = NULL;
ATH_TXQ_UNLOCK(txq);
break;
}
@@ -3782,6 +3781,8 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
break;
}
ATH_TXQ_REMOVE_HEAD(txq, bf_list);
+ if (txq->axq_depth == 0)
+ txq->axq_link = NULL;
ATH_TXQ_UNLOCK(txq);
ni = bf->bf_node;