Date: Fri, 8 Oct 2010 20:42:59 +0000 (UTC) From: Pyun YongHyeon <yongari@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r213622 - stable/8/sys/dev/sis Message-ID: <201010082042.o98KgxWw013375@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yongari Date: Fri Oct 8 20:42:59 2010 New Revision: 213622 URL: http://svn.freebsd.org/changeset/base/213622 Log: MFC r212120: Avoid controller reinitialization which could be triggered by dhclient(8) or alias addresses are added. PR: kern/87506 Modified: stable/8/sys/dev/sis/if_sis.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/sis/if_sis.c ============================================================================== --- stable/8/sys/dev/sis/if_sis.c Fri Oct 8 20:41:15 2010 (r213621) +++ stable/8/sys/dev/sis/if_sis.c Fri Oct 8 20:42:59 2010 (r213622) @@ -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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010082042.o98KgxWw013375>