svn commit: r188457 - head/sys/dev/bge

[Marius Strobl]

Author: marius
Date: Tue Feb 10 21:54:23 2009
New Revision: 188457
URL: http://svn.freebsd.org/changeset/base/188457

Log:
  Don't reset the PHY probe retry counter within the loop so
  it will eventually terminate as intended.
  
  Submitted by:	Helen Zhang

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Tue Feb 10 21:51:33 2009	(r188456)
+++ head/sys/dev/bge/if_bge.c	Tue Feb 10 21:54:23 2009	(r188457)
@@ -2674,11 +2674,11 @@ bge_attach(device_t dev)
 		 * if we get a conflict with the ASF firmware accessing
 		 * the PHY.
 		 */
+		trys = 0;
 		BGE_CLRBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP);
 again:
 		bge_asf_driver_up(sc);
 
-		trys = 0;
 		if (mii_phy_probe(dev, &sc->bge_miibus,
 		    bge_ifmedia_upd, bge_ifmedia_sts)) {
 			if (trys++ < 4) {