summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2009-02-10 21:54:23 +0000
committermarius <marius@FreeBSD.org>2009-02-10 21:54:23 +0000
commit05ddd147f8ed9dfa25cc814f2818f8916e958def (patch)
tree80e0be73fed9d9a442b6f424ebbd39f7f11ea76e
parent840503d8f650fa1fda4580c8850b8293c9339bed (diff)
downloadFreeBSD-src-05ddd147f8ed9dfa25cc814f2818f8916e958def.zip
FreeBSD-src-05ddd147f8ed9dfa25cc814f2818f8916e958def.tar.gz
Don't reset the PHY probe retry counter within the loop so
it will eventually terminate as intended. Submitted by: Helen Zhang
-rw-r--r--sys/dev/bge/if_bge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 335200b..e9e5b93 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -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) {
OpenPOWER on IntegriCloud