From e68e98804b6164b86f57f120fefe946fe95b1455 Mon Sep 17 00:00:00 2001 From: yongari Date: Wed, 10 Jul 2013 06:46:46 +0000 Subject: [PATCH] Avoid controller reinitialization which could be triggered by dhclient(8) or alias addresses are added. Tested by: dcx dcy --- sys/dev/hme/if_hme.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c index 9f310ee4f11e..1249dc4a2e13 100644 --- a/sys/dev/hme/if_hme.c +++ b/sys/dev/hme/if_hme.c @@ -742,6 +742,10 @@ hme_init_locked(struct hme_softc *sc) u_int32_t n, v; HME_LOCK_ASSERT(sc, MA_OWNED); + + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return; + /* * Initialization sequence. The numbered steps below correspond * to the sequence outlined in section 6.3.5.1 in the Ethernet @@ -1324,6 +1328,7 @@ hme_eint(struct hme_softc *sc, u_int status) /* check for fatal errors that needs reset to unfreeze DMA engine */ if ((status & HME_SEB_STAT_FATAL_ERRORS) != 0) { HME_WHINE(sc->sc_dev, "error signaled, status=%#x\n", status); + sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; hme_init_locked(sc); } } @@ -1370,6 +1375,7 @@ hme_watchdog(struct hme_softc *sc) device_printf(sc->sc_dev, "device timeout (no link)\n"); ++ifp->if_oerrors; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; hme_init_locked(sc); hme_start_locked(ifp); return (EJUSTRETURN);