diff options
| author | yongari <yongari@FreeBSD.org> | 2011-11-07 18:26:38 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2011-11-07 18:26:38 +0000 |
| commit | f2e78d375a96a32ee88078d0baaa576822b9aa26 (patch) | |
| tree | c7465a7e28d259e5a287194f79b778d294c5e347 /sys/dev/ti | |
| parent | 1439814d211ec98320a37cba31bbc7ba37fb1625 (diff) | |
| download | FreeBSD-src-f2e78d375a96a32ee88078d0baaa576822b9aa26.zip FreeBSD-src-f2e78d375a96a32ee88078d0baaa576822b9aa26.tar.gz | |
o Remove unnecessary controller reinitialization.
o Do not blindly UP controller when MTU is changed. Reinitialize
controller only if driver is running.
o Remove useless ti_stop() in ti_watchdog() since ti_init_locked()
always invokes ti_stop().
Diffstat (limited to 'sys/dev/ti')
| -rw-r--r-- | sys/dev/ti/if_ti.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index aeaacff..f01b638 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -3091,6 +3091,9 @@ ti_init_locked(void *xsc) { struct ti_softc *sc = xsc; + if (sc->ti_ifp->if_drv_flags & IFF_DRV_RUNNING) + return; + /* Cancel pending I/O and flush buffers. */ ti_stop(sc); @@ -3369,7 +3372,10 @@ ti_ioctl(struct ifnet *ifp, u_long command, caddr_t data) error = EINVAL; else { ifp->if_mtu = ifr->ifr_mtu; - ti_init_locked(sc); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + ti_init_locked(sc); + } } TI_UNLOCK(sc); break; @@ -3783,7 +3789,7 @@ ti_watchdog(void *arg) ifp = sc->ti_ifp; if_printf(ifp, "watchdog timeout -- resetting\n"); - ti_stop(sc); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ti_init_locked(sc); ifp->if_oerrors++; |
