summaryrefslogtreecommitdiffstats
path: root/sys/dev/sis
diff options
context:
space:
mode:
authoryongari <yongari@FreeBSD.org>2010-09-01 22:16:25 +0000
committeryongari <yongari@FreeBSD.org>2010-09-01 22:16:25 +0000
commit3d51d3dedf3acc91d5cd0fda05cc758d186324f9 (patch)
tree6e2b90100c1117921088b8f624195aabb5aca9ea /sys/dev/sis
parent7e669b1d632837c794787a61a9d7838a896b7a7e (diff)
downloadFreeBSD-src-3d51d3dedf3acc91d5cd0fda05cc758d186324f9.zip
FreeBSD-src-3d51d3dedf3acc91d5cd0fda05cc758d186324f9.tar.gz
Avoid controller reinitialization which could be triggered by
dhclient(8) or alias addresses are added. PR: kern/87506
Diffstat (limited to 'sys/dev/sis')
-rw-r--r--sys/dev/sis/if_sis.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index cecffe2..6e9b8db 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -1741,6 +1741,7 @@ sis_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
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.
*/
OpenPOWER on IntegriCloud