diff options
| author | adrian <adrian@FreeBSD.org> | 2012-09-25 20:41:43 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-09-25 20:41:43 +0000 |
| commit | 4149ca24699a35b4acb7629aafd0bf4d716859be (patch) | |
| tree | df4598fb038ff3d0280f01868c8f706dc4d59e6c | |
| parent | dd583c889b4462ff936b8a036366b07239966e22 (diff) | |
| download | FreeBSD-src-4149ca24699a35b4acb7629aafd0bf4d716859be.zip FreeBSD-src-4149ca24699a35b4acb7629aafd0bf4d716859be.tar.gz | |
Oops - don't do the clrdmask check in ath_tx_xmit_normal() - the wrong
lock may be held.
Kim reported that the TID lock wasn't held when ath_tx_update_clrdmask()
was called. Well, the underlying hardware TXQ for that TID.
I'm betting it's the cabq stuff. ath_tx_xmit_normal() can be called
for both real and software cabq. For software cabq, the real destination
txq is different to the txq. So, the lock check will fail.
Reported by: Kim Culhan <w8hdkim@gmail.com>
| -rw-r--r-- | sys/dev/ath/if_ath_tx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c index adde6fc..42c076c 100644 --- a/sys/dev/ath/if_ath_tx.c +++ b/sys/dev/ath/if_ath_tx.c @@ -1356,9 +1356,6 @@ ath_tx_xmit_normal(struct ath_softc *sc, struct ath_txq *txq, */ bf->bf_state.bfs_txflags |= HAL_TXDESC_CLRDMASK; - /* See if clrdmask needs to be set */ - ath_tx_update_clrdmask(sc, tid, bf); - /* Setup the descriptor before handoff */ ath_tx_do_ratelookup(sc, bf); ath_tx_calc_duration(sc, bf); @@ -2820,6 +2817,8 @@ ath_tx_swq(struct ath_softc *sc, struct ieee80211_node *ni, struct ath_txq *txq, } else if (txq->axq_depth < sc->sc_hwq_limit) { /* AMPDU not running, attempt direct dispatch */ DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: xmit_normal\n", __func__); + /* See if clrdmask needs to be set */ + ath_tx_update_clrdmask(sc, atid, bf); ath_tx_xmit_normal(sc, txq, bf); } else { /* Busy; queue */ |
