d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begin breaking out the txrx stop code into a locked and unlocked variant.

Browse Source 
PR:	kern/165220
This commit is contained in:
Adrian Chadd 2012-02-17 03:23:01 +00:00
parent e17d7df80d
commit 21008bf10d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/ath/if_ath.c
View File

@ -1903,15 +1903,16 @@ ath_stop_locked(struct ifnet *ifp)
#define MAX_TXRX_ITERATIONS 1000
static void
ath_txrx_stop(struct ath_softc *sc)
ath_txrx_stop_locked(struct ath_softc *sc)
{
int i = MAX_TXRX_ITERATIONS;
ATH_UNLOCK_ASSERT(sc);
ATH_PCU_LOCK_ASSERT(sc);
/* Stop any new TX/RX from occuring */
taskqueue_block(sc->sc_tq);
ATH_PCU_LOCK(sc);
/*
* Sleep until all the pending operations have completed.
*
@ -1925,7 +1926,6 @@ ath_txrx_stop(struct ath_softc *sc)
msleep(sc, &sc->sc_pcu_mtx, 0, "ath_txrx_stop", 1);
i--;
}
ATH_PCU_UNLOCK(sc);
if (i <= 0)
device_printf(sc->sc_dev,
@ -1934,6 +1934,17 @@ ath_txrx_stop(struct ath_softc *sc)
}
#undef MAX_TXRX_ITERATIONS
static void
ath_txrx_stop(struct ath_softc *sc)
{
ATH_UNLOCK_ASSERT(sc);
ATH_PCU_UNLOCK_ASSERT(sc);
ATH_PCU_LOCK(sc);
ath_txrx_stop_locked(sc);
ATH_PCU_UNLOCK(sc);
}
static void
ath_txrx_start(struct ath_softc *sc)
{