Author: yongari
Date: Fri Oct 8 20:44:35 2010
New Revision: 213623
URL: http://svn.freebsd.org/changeset/base/213623
Log:
MFC r212120:
Avoid controller reinitialization which could be triggered by
dhclient(8) or alias addresses are added.
PR: kern/87506
Modified:
stable/7/sys/dev/sis/if_sis.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/sis/if_sis.c
==============================================================================
--- stable/7/sys/dev/sis/if_sis.c Fri Oct 8 20:42:59 2010
(r213622)
+++ stable/7/sys/dev/sis/if_sis.c Fri Oct 8 20:44:35 2010
(r213623)
@@ -1738,6 +1738,7 @@ sis_poll(struct ifnet *ifp, enum poll_cm
if (status & SIS_ISR_SYSERR) {
sis_reset(sc);
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
sis_initl(sc);
}
}
@@ -1792,6 +1793,7 @@ sis_intr(void *arg)
if (status & SIS_ISR_SYSERR) {
sis_reset(sc);
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
sis_initl(sc);
SIS_UNLOCK(sc);
return;
@@ -1967,6 +1969,9 @@ sis_initl(struct sis_softc *sc)
SIS_LOCK_ASSERT(sc);
+ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+ return;
+
/*
* Cancel pending I/O and free all RX/TX buffers.
*/
_______________________________________________
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"
