diff options
| author | yongari <yongari@FreeBSD.org> | 2010-09-21 17:25:15 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2010-09-21 17:25:15 +0000 |
| commit | 84e48d7980ff3f41607bb135b13b68b581bc1f0b (patch) | |
| tree | 4d448a7a29ac0730c705aa1956c153fb84c3d14e /sys/dev/ae | |
| parent | e7b0e3848ac6bbe7b09f5c54d49f586380cc7063 (diff) | |
| download | FreeBSD-src-84e48d7980ff3f41607bb135b13b68b581bc1f0b.zip FreeBSD-src-84e48d7980ff3f41607bb135b13b68b581bc1f0b.tar.gz | |
Remove unnecessary controller reinitialization.
PR: kern/87506
Diffstat (limited to 'sys/dev/ae')
| -rw-r--r-- | sys/dev/ae/if_ae.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index d2812a4..c47a03e 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -565,6 +565,8 @@ ae_init_locked(ae_softc_t *sc) AE_LOCK_ASSERT(sc); ifp = sc->ifp; + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return (0); mii = device_get_softc(sc->miibus); ae_stop(sc); @@ -1786,7 +1788,10 @@ ae_int_task(void *arg, int pending) if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { if ((val & (AE_ISR_DMAR_TIMEOUT | AE_ISR_DMAW_TIMEOUT | AE_ISR_PHY_LINKDOWN)) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ae_init_locked(sc); + AE_UNLOCK(sc); + return; } if ((val & AE_ISR_TX_EVENT) != 0) ae_tx_intr(sc); @@ -1997,6 +2002,7 @@ ae_watchdog(ae_softc_t *sc) if_printf(ifp, "watchdog timeout - resetting.\n"); ifp->if_oerrors++; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ae_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) taskqueue_enqueue(sc->tq, &sc->tx_task); @@ -2107,8 +2113,10 @@ ae_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) else if (ifp->if_mtu != ifr->ifr_mtu) { AE_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; ae_init_locked(sc); + } AE_UNLOCK(sc); } break; |
