svn commit: r235034 - head/sys/dev/ath

Adrian Chadd adrian at FreeBSD.org
Fri May 4 20:31:27 UTC 2012


Author: adrian
Date: Fri May  4 20:31:27 2012
New Revision: 235034
URL: http://svn.freebsd.org/changeset/base/235034

Log:
  Fix a couple of sc_ac2q[] mappings that were using the TID, not the AC.
  
  PR:		kern/167588

Modified:
  head/sys/dev/ath/if_ath_tx.c

Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c	Fri May  4 19:49:24 2012	(r235033)
+++ head/sys/dev/ath/if_ath_tx.c	Fri May  4 20:31:27 2012	(r235034)
@@ -4307,9 +4307,9 @@ ath_addba_request(struct ieee80211_node 
 	 * it'll be "after" the left edge of the BAW and thus it'll
 	 * fall within it.
 	 */
-	ATH_TXQ_LOCK(sc->sc_ac2q[atid->tid]);
+	ATH_TXQ_LOCK(sc->sc_ac2q[atid->ac]);
 	ath_tx_tid_pause(sc, atid);
-	ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->tid]);
+	ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
 
 	DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL,
 	    "%s: called; dialogtoken=%d, baparamset=%d, batimeout=%d\n",
@@ -4395,9 +4395,9 @@ ath_addba_stop(struct ieee80211_node *ni
 	DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, "%s: called\n", __func__);
 
 	/* Pause TID traffic early, so there aren't any races */
-	ATH_TXQ_LOCK(sc->sc_ac2q[atid->tid]);
+	ATH_TXQ_LOCK(sc->sc_ac2q[atid->ac]);
 	ath_tx_tid_pause(sc, atid);
-	ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->tid]);
+	ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
 
 	/* There's no need to hold the TXQ lock here */
 	sc->sc_addba_stop(ni, tap);


More information about the svn-src-all mailing list