Author: yongari
Date: Fri Sep 24 19:24:45 2010
New Revision: 213128
URL: http://svn.freebsd.org/changeset/base/213128
Log:
MFC r211766:
vr_init_locked() will stop and reset the controller. Remove
unnecessary vr_stop()/vr_reset() calls.
Modified:
stable/8/sys/dev/vr/if_vr.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/vr/if_vr.c
==============================================================================
--- stable/8/sys/dev/vr/if_vr.c Fri Sep 24 19:22:41 2010 (r213127)
+++ stable/8/sys/dev/vr/if_vr.c Fri Sep 24 19:24:45 2010 (r213128)
@@ -1558,8 +1558,6 @@ vr_tick(void *xsc)
if ((sc->vr_flags & VR_F_RESTART) != 0) {
device_printf(sc->vr_dev, "restarting\n");
sc->vr_stat.num_restart++;
- vr_stop(sc);
- vr_reset(sc);
sc->vr_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
vr_init_locked(sc);
sc->vr_flags &= ~VR_F_RESTART;
@@ -2299,8 +2297,6 @@ vr_watchdog(struct vr_softc *sc)
ifp->if_oerrors++;
if_printf(ifp, "watchdog timeout\n");
- vr_stop(sc);
- vr_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
vr_init_locked(sc);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
