diff options
| author | yongari <yongari@FreeBSD.org> | 2010-08-24 19:41:15 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2010-08-24 19:41:15 +0000 |
| commit | 86e44bf444e7c433d320ae07da9c82cbfbbb7063 (patch) | |
| tree | d47fb50a8896ea9435d8b840492c1cde4b898adc /sys/dev | |
| parent | 35f3332f4d5f517fcbd4769185e8b478aebb4a36 (diff) | |
| download | FreeBSD-src-86e44bf444e7c433d320ae07da9c82cbfbbb7063.zip FreeBSD-src-86e44bf444e7c433d320ae07da9c82cbfbbb7063.tar.gz | |
Remove unnecessary controller reinitialization.
PR: kern/87506
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/age/if_age.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c index 15ce0ef..99c3c43 100644 --- a/sys/dev/age/if_age.c +++ b/sys/dev/age/if_age.c @@ -1781,6 +1781,7 @@ age_watchdog(struct age_softc *sc) if ((sc->age_flags & AGE_FLAG_LINK) == 0) { if_printf(sc->age_ifp, "watchdog timeout (missed link)\n"); ifp->if_oerrors++; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; age_init_locked(sc); return; } @@ -1793,6 +1794,7 @@ age_watchdog(struct age_softc *sc) } if_printf(sc->age_ifp, "watchdog timeout\n"); ifp->if_oerrors++; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; age_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) taskqueue_enqueue(sc->age_tq, &sc->age_tx_task); @@ -1817,8 +1819,10 @@ age_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) else if (ifp->if_mtu != ifr->ifr_mtu) { AGE_LOCK(sc); ifp->if_mtu = ifr->ifr_mtu; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; age_init_locked(sc); + } AGE_UNLOCK(sc); } break; @@ -2165,6 +2169,7 @@ age_int_task(void *arg, int pending) if ((status & INTR_DMA_WR_TO_RST) != 0) device_printf(sc->age_dev, "DMA write error! -- resetting\n"); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; age_init_locked(sc); } if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) @@ -2529,6 +2534,9 @@ age_init_locked(struct age_softc *sc) ifp = sc->age_ifp; mii = device_get_softc(sc->age_miibus); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return; + /* * Cancel any pending I/O. */ |
