svn commit: r227312 - head/sys/dev/ti

[Pyun YongHyeon]

Author: yongari
Date: Mon Nov  7 18:26:38 2011
New Revision: 227312
URL: http://svn.freebsd.org/changeset/base/227312

Log:
   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().

Modified:
  head/sys/dev/ti/if_ti.c

Modified: head/sys/dev/ti/if_ti.c
==============================================================================
--- head/sys/dev/ti/if_ti.c	Mon Nov  7 18:19:20 2011	(r227311)
+++ head/sys/dev/ti/if_ti.c	Mon Nov  7 18:26:38 2011	(r227312)
@@ -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 comma
 			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++;