Author: thompsa
Date: Sat May 26 07:44:35 2012
New Revision: 236054
URL: http://svn.freebsd.org/changeset/base/236054
Log:
MFC r235147
Do not reinitialise the interface if it is already running, this prevents the
bootp+nfs code from working as it calls init on each dhcp send and rx fails
to
start in time.
Modified:
stable/9/sys/dev/tsec/if_tsec.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/dev/tsec/if_tsec.c
==============================================================================
--- stable/9/sys/dev/tsec/if_tsec.c Sat May 26 07:44:00 2012
(r236053)
+++ stable/9/sys/dev/tsec/if_tsec.c Sat May 26 07:44:35 2012
(r236054)
@@ -359,6 +359,9 @@ tsec_init_locked(struct tsec_softc *sc)
struct ifnet *ifp = sc->tsec_ifp;
uint32_t timeout, val, i;
+ if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+ return;
+
TSEC_GLOBAL_LOCK_ASSERT(sc);
tsec_stop(sc);
_______________________________________________
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"
