diff options
Diffstat (limited to 'sys/dev/mii')
| -rw-r--r-- | sys/dev/mii/ciphy.c | 9 | ||||
| -rw-r--r-- | sys/dev/mii/rgephy.c | 11 | ||||
| -rw-r--r-- | sys/dev/mii/xmphy.c | 9 |
3 files changed, 4 insertions, 25 deletions
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index 439916812cf..62c42be29ea 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciphy.c,v 1.13 2006/03/10 09:53:16 jsg Exp $ */ +/* $OpenBSD: ciphy.c,v 1.14 2006/10/07 23:44:51 brad Exp $ */ /* $FreeBSD: ciphy.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -177,13 +177,6 @@ ciphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: -#ifdef foo - /* - * If we're already in auto mode, just return. - */ - if (PHY_READ(sc, CIPHY_MII_BMCR) & CIPHY_BMCR_AUTOEN) - return (0); -#endif if (mii_phy_auto(sc, 0) == EJUSTRETURN) return (0); break; diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c index f28ed70a477..0813b3ebdec 100644 --- a/sys/dev/mii/rgephy.c +++ b/sys/dev/mii/rgephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rgephy.c,v 1.16 2006/09/17 19:36:54 brad Exp $ */ +/* $OpenBSD: rgephy.c,v 1.17 2006/10/07 23:44:51 brad Exp $ */ /* * Copyright (c) 2003 * Bill Paul <wpaul@windriver.com>. All rights reserved. @@ -183,13 +183,6 @@ rgephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: -#ifdef foo - /* - * If we're already in auto mode, just return. - */ - if (PHY_READ(sc, RGEPHY_MII_BMCR) & RGEPHY_BMCR_AUTOEN) - return (0); -#endif (void) rgephy_mii_phy_auto(sc); break; case IFM_1000_T: @@ -235,7 +228,7 @@ setit: RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG); PHY_WRITE(sc, RGEPHY_MII_ANAR, anar); break; -#ifdef foo +#if 0 case IFM_NONE: PHY_WRITE(sc, MII_BMCR, BMCR_ISO|BMCR_PDOWN); break; diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index 23808740861..797da525611 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmphy.c,v 1.15 2006/08/05 16:56:56 brad Exp $ */ +/* $OpenBSD: xmphy.c,v 1.16 2006/10/07 23:44:51 brad Exp $ */ /* * Copyright (c) 2000 @@ -170,13 +170,6 @@ xmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: -#ifdef foo - /* - * If we're already in auto mode, just return. - */ - if (PHY_READ(sc, XMPHY_MII_BMCR) & XMPHY_BMCR_AUTOEN) - return (0); -#endif (void) xmphy_mii_phy_auto(sc); break; case IFM_1000_SX: |