diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-05-29 00:22:47 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-05-29 00:22:47 +0000 |
| commit | 25ef9bd51c9ea5756728a1c509ab0702f161636d (patch) | |
| tree | 55388015107e475d620151c88a907df4e5103883 | |
| parent | 17c28aaa72fd6e9623e22b618d39789ed78d6ef1 (diff) | |
formatting
| -rw-r--r-- | sys/dev/mii/eephy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index fd708f6d6c3..1dda65a443e 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.23 2006/01/15 03:06:21 jsg Exp $ */ +/* $OpenBSD: eephy.c,v 1.24 2006/05/29 00:22:46 brad Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -250,9 +250,9 @@ eephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) /* * If we're already in auto mode, just return. */ - if (sc->mii_flags & MIIF_DOINGAUTO) { + if (sc->mii_flags & MIIF_DOINGAUTO) return (0); - } + PHY_RESET(sc); (void) eephy_mii_phy_auto(sc, 1); break; @@ -448,10 +448,8 @@ eephy_mii_phy_auto(struct mii_softc *sc, int waitfor) /* Wait 500ms for it to complete. */ for (i = 0; i < 500; i++) { bmsr = PHY_READ(sc, E1000_SR) | PHY_READ(sc, E1000_SR); - - if (bmsr & E1000_SR_AUTO_NEG_COMPLETE) { + if (bmsr & E1000_SR_AUTO_NEG_COMPLETE) return (0); - } DELAY(1000); } |