diff options
| author | wpaul <wpaul@FreeBSD.org> | 2004-04-23 17:15:14 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2004-04-23 17:15:14 +0000 |
| commit | 1291cc3eae682ac8efaeda1225dfbc26c6ce58ea (patch) | |
| tree | 8bc86190520bc6e21fada18c71eeaf9a8bfefc1a /sys/dev/if_ndis | |
| parent | 18540c3839059686be55268e804dd8065953cc17 (diff) | |
| download | FreeBSD-src-1291cc3eae682ac8efaeda1225dfbc26c6ce58ea.zip FreeBSD-src-1291cc3eae682ac8efaeda1225dfbc26c6ce58ea.tar.gz | |
Correct KASSERT()s that check for initialization of mutexes in ndis_detach(),
which are different now that I'm not using mutex pools anymore.
Noticed by: des
Diffstat (limited to 'sys/dev/if_ndis')
| -rw-r--r-- | sys/dev/if_ndis/if_ndis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 78e6196..b261c4e 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -687,9 +687,9 @@ ndis_detach(dev) struct ifnet *ifp; sc = device_get_softc(dev); - KASSERT(mtx_initialized(sc->ndis_mtx), + KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized")); - KASSERT(mtx_initialized(sc->ndis_intrmtx), + KASSERT(mtx_initialized(&sc->ndis_intrmtx), ("ndis interrupt mutex not initialized")); NDIS_LOCK(sc); ifp = &sc->arpcom.ac_if; @@ -1032,6 +1032,8 @@ ndis_ticktask(xsc) ndis_media_state linkstate; int error, len; + mtx_unlock(&Giant); + sc = xsc; hangfunc = sc->ndis_chars.nmc_checkhang_func; @@ -1066,6 +1068,8 @@ ndis_ticktask(xsc) NDIS_UNLOCK(sc); + mtx_lock(&Giant); + return; } |
