mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-06 13:09:50 +00:00
Code Issues Releases Activity

Revert rev 1.93 and replace it by grabbing the vr lock before calling

Browse Source 
mii_pollstat().  The previous was causing the vr lock to recurse.

PR:	kern/70189
This commit is contained in:
Scott Long 2004-08-11 04:30:49 +00:00
parent 217a4b6e4e
commit 8ab79fb0e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133468
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/vr/if_vr.c
View File

@ -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;
}

4
sys/pci/if_vr.c
View File

@ -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;
}