svn commit: r213126 - stable/8/sys/dev/vr
Pyun YongHyeon
yongari at FreeBSD.org
Fri Sep 24 19:19:53 UTC 2010
Author: yongari
Date: Fri Sep 24 19:19:53 2010
New Revision: 213126
URL: http://svn.freebsd.org/changeset/base/213126
Log:
MFC r211765:
Remove unnecessary controller reinitialization.
CAM filter handling was rewritten long time ago so it should not
require controller reinitialization.
PR: kern/87506
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:18:03 2010 (r213125)
+++ stable/8/sys/dev/vr/if_vr.c Fri Sep 24 19:19:53 2010 (r213126)
@@ -1560,6 +1560,7 @@ vr_tick(void *xsc)
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;
}
@@ -2016,6 +2017,9 @@ vr_init_locked(struct vr_softc *sc)
ifp = sc->vr_ifp;
mii = device_get_softc(sc->vr_miibus);
+ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+ return;
+
/* Cancel pending I/O and free all RX/TX buffers. */
vr_stop(sc);
vr_reset(sc);
@@ -2287,6 +2291,7 @@ vr_watchdog(struct vr_softc *sc)
if_printf(sc->vr_ifp, "watchdog timeout "
"(missed link)\n");
ifp->if_oerrors++;
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
vr_init_locked(sc);
return;
}
@@ -2296,6 +2301,7 @@ vr_watchdog(struct vr_softc *sc)
vr_stop(sc);
vr_reset(sc);
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
vr_init_locked(sc);
if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
More information about the svn-src-stable-8
mailing list