Author: yongari
Date: Wed Sep 1 22:16:25 2010
New Revision: 212120
URL: http://svn.freebsd.org/changeset/base/212120
Log:
Avoid controller reinitialization which could be triggered by
dhclient(8) or alias addresses are added.
PR: kern/87506
Modified:
head/sys/dev/sis/if_sis.c
Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c Wed Sep 1 22:08:23 2010 (r212119)
+++ head/sys/dev/sis/if_sis.c Wed Sep 1 22:16:25 2010 (r212120)
@@ -1741,6 +1741,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);
}
}
@@ -1796,6 +1797,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;
@@ -1971,6 +1973,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.
*/
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
