summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2007-06-03 02:16:48 +0000
committersam <sam@FreeBSD.org>2007-06-03 02:16:48 +0000
commit5b6f6b13d1bfd5ff93ffd04651d3296eefadfb2a (patch)
tree907ec69005301ee2dff4288c37ce68ad3fb12155
parent9116a352cf2b6e47064388733125ed74864a08a9 (diff)
downloadFreeBSD-src-5b6f6b13d1bfd5ff93ffd04651d3296eefadfb2a.zip
FreeBSD-src-5b6f6b13d1bfd5ff93ffd04651d3296eefadfb2a.tar.gz
disable taskqueue_drain calls on transition to INIT state; we need to
find another way to do this as we cannot hold the softc mtx across these calls
-rw-r--r--sys/dev/ath/if_ath.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index b99e0e3..276516f 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -4600,11 +4600,13 @@ ath_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
*/
sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS);
ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL);
+#if 0
/* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */
taskqueue_drain(sc->sc_tq, &sc->sc_rxtask);
taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask);
taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask);
taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask);
+#endif
ath_rate_newstate(sc, nstate);
goto done;
}
OpenPOWER on IntegriCloud