summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryongari <yongari@FreeBSD.org>2013-11-05 06:48:12 +0000
committeryongari <yongari@FreeBSD.org>2013-11-05 06:48:12 +0000
commit3a014860fee3f962c848987210b061313458f14a (patch)
tree850b053fb70a13112281c9f6d062a5cc036556e1
parent6db24298695ea5b1803ca4b81e339434bfd060d1 (diff)
downloadFreeBSD-src-3a014860fee3f962c848987210b061313458f14a.zip
FreeBSD-src-3a014860fee3f962c848987210b061313458f14a.tar.gz
MFC r257490:
Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link. Approved by: re (glebius)
-rw-r--r--sys/dev/msk/if_msk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 526062b..95a39e9 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -4070,12 +4070,12 @@ msk_init_locked(struct msk_if_softc *sc_if)
CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask);
CSR_READ_4(sc, B0_IMSK);
- sc_if->msk_flags &= ~MSK_FLAG_LINK;
- mii_mediachg(mii);
-
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+ sc_if->msk_flags &= ~MSK_FLAG_LINK;
+ mii_mediachg(mii);
+
callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if);
}
OpenPOWER on IntegriCloud