From a3fba644404cdf23b516738878b4813300347454 Mon Sep 17 00:00:00 2001 From: scottl Date: Wed, 11 Aug 2004 04:30:49 +0000 Subject: Revert rev 1.93 and replace it by grabbing the vr lock before calling mii_pollstat(). The previous was causing the vr lock to recurse. PR: kern/70189 --- sys/pci/if_vr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/pci') diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index 9f7025b..b1eeebb 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -503,9 +503,7 @@ vr_miibus_statchg(device_t dev) struct vr_softc *sc = device_get_softc(dev); mii = device_get_softc(sc->vr_miibus); - VR_LOCK(sc); vr_setcfg(sc, mii->mii_media_active); - VR_UNLOCK(sc); } /* @@ -1563,7 +1561,9 @@ vr_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) struct mii_data *mii; mii = device_get_softc(sc->vr_miibus); + VR_LOCK(sc); mii_pollstat(mii); + VR_UNLOCK(sc); ifmr->ifm_active = mii->mii_media_active; ifmr->ifm_status = mii->mii_media_status; } -- cgit v1.1