d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary controller reinitialization by checking

Browse Source 
IFF_DRV_RUNNING flag.  Previously running dhclient or adding alias
addresses reinitialized controller and it resulted in unnecessary
link flips.

Reviewed by:	marius
This commit is contained in:
yongari 2011-05-20 17:01:22 +00:00
parent 343e29c626
commit 7c8c16870e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/gem/if_gem.c
View File

@ -739,8 +739,10 @@ gem_reset_rxdma(struct gem_softc *sc)
{ {
int i; int i;
if (gem_reset_rx(sc) != 0) if (gem_reset_rx(sc) != 0) {
sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
return (gem_init_locked(sc)); return (gem_init_locked(sc));
}
for (i = 0; i < GEM_NRXDESC; i++) for (i = 0; i < GEM_NRXDESC; i++)
if (sc->sc_rxsoft[i].rxs_mbuf != NULL) if (sc->sc_rxsoft[i].rxs_mbuf != NULL)
GEM_UPDATE_RXDESC(sc, i); GEM_UPDATE_RXDESC(sc, i);
@ -924,6 +926,9 @@ gem_init_locked(struct gem_softc *sc)
GEM_LOCK_ASSERT(sc, MA_OWNED); GEM_LOCK_ASSERT(sc, MA_OWNED);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
return;
#ifdef GEM_DEBUG #ifdef GEM_DEBUG
CTR2(KTR_GEM, "%s: %s: calling stop", device_get_name(sc->sc_dev), CTR2(KTR_GEM, "%s: %s: calling stop", device_get_name(sc->sc_dev),
__func__); __func__);
@ -1762,6 +1767,7 @@ gem_intr(void *v)
if ((status2 & if ((status2 &
(GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) != 0) { (GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) != 0) {
sc->sc_ifp->if_oerrors++; sc->sc_ifp->if_oerrors++;
sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
gem_init_locked(sc); gem_init_locked(sc);
} }
} }
@ -1814,6 +1820,7 @@ gem_watchdog(struct gem_softc *sc)
++ifp->if_oerrors; ++ifp->if_oerrors;
/* Try to get more packets going. */ /* Try to get more packets going. */
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
gem_init_locked(sc); gem_init_locked(sc);
gem_start_locked(ifp); gem_start_locked(ifp);
return (EJUSTRETURN); return (EJUSTRETURN);