diff options
| author | wpaul <wpaul@FreeBSD.org> | 2000-12-12 19:31:14 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2000-12-12 19:31:14 +0000 |
| commit | 0ee7429451f32b5027bdb6dac8f4378f73910e3d (patch) | |
| tree | e048ef73a889553c164b8fbd498e85d22f67e003 /sys/dev/mii/brgphy.c | |
| parent | 126b557e53a07a423a0c14168d2c4a9e1983c9b9 (diff) | |
| download | FreeBSD-src-0ee7429451f32b5027bdb6dac8f4378f73910e3d.zip FreeBSD-src-0ee7429451f32b5027bdb6dac8f4378f73910e3d.tar.gz | |
Grrrrr. That last commit was supposed to be to the head, not to -stable
(even though I want the fixes in -stable anyway). I'm sure I'm going
to get flamed now for committing to -stable and -current too quickly.
*sigh*
Diffstat (limited to 'sys/dev/mii/brgphy.c')
| -rw-r--r-- | sys/dev/mii/brgphy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index a0118d5..38febae 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -165,6 +165,8 @@ static int brgphy_detach(dev) sc = device_get_softc(dev); mii = device_get_softc(device_get_parent(dev)); + if (sc->mii_flags & MIIF_DOINGAUTO) + untimeout(mii_phy_auto_timeout, sc, sc->mii_auto_ch); sc->mii_dev = NULL; LIST_REMOVE(sc, mii_list); @@ -399,7 +401,7 @@ brgphy_mii_phy_auto(mii, waitfor) */ if ((mii->mii_flags & MIIF_DOINGAUTO) == 0) { mii->mii_flags |= MIIF_DOINGAUTO; - timeout(mii_phy_auto_timeout, mii, hz >> 1); + mii->mii_auto_ch = timeout(mii_phy_auto_timeout, mii, hz >> 1); } return (EJUSTRETURN); } |
