aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sf
diff options
context:
space:
mode:
authorJonathan Lemon <jlemon@FreeBSD.org>2001-09-29 19:28:31 +0000
committerJonathan Lemon <jlemon@FreeBSD.org>2001-09-29 19:28:31 +0000
commitcd62a9cb38a58597b7d6094f7104d8271c1bb0dd (patch)
tree059d83b39e680ff22f9e9aee5eb54410ca5ecbe3 /sys/dev/sf
parent896bddb5464dcb1b3228f2f06e499b26c39e14d7 (diff)
downloadsrc-cd62a9cb38a58597b7d6094f7104d8271c1bb0dd.tar.gz
src-cd62a9cb38a58597b7d6094f7104d8271c1bb0dd.zip
Do not call mii_pollstat() from within device tick routines; the status
information is updated by mii_tick(). Pointed out by: wpaul (a while back)
Notes
Notes: svn path=/head/; revision=84147
Diffstat (limited to 'sys/dev/sf')
-rw-r--r--sys/dev/sf/if_sf.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index c0c05d5300a1..487b48fb9e0c 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -1489,13 +1489,12 @@ static void sf_stats_update(xsc)
stats.sf_tx_multi_colls + stats.sf_tx_excess_colls;
mii_tick(mii);
- if (!sc->sf_link) {
- mii_pollstat(mii);
- if (mii->mii_media_status & IFM_ACTIVE &&
- IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)
- sc->sf_link++;
- if (ifp->if_snd.ifq_head != NULL)
- sf_start(ifp);
+
+ if (!sc->sf_link && mii->mii_media_status & IFM_ACTIVE &&
+ IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
+ sc->sf_link++;
+ if (ifp->if_snd.ifq_head != NULL)
+ sf_start(ifp);
}
sc->sf_stat_ch = timeout(sf_stats_update, sc, hz);