diff options
| author | jlemon <jlemon@FreeBSD.org> | 2001-03-28 07:01:45 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 2001-03-28 07:01:45 +0000 |
| commit | 1f6d026436e51c7317cd4d918a8f7759281c9471 (patch) | |
| tree | 7c574e8b8af62ba895ddc5a35c29c555d96697cb | |
| parent | e636d5eb802c973f2ec359fa6ba85e5aa6b47b6a (diff) | |
| download | FreeBSD-src-1f6d026436e51c7317cd4d918a8f7759281c9471.zip FreeBSD-src-1f6d026436e51c7317cd4d918a8f7759281c9471.tar.gz | |
Back out previous commit until I figure out a way to do it properly.
We really want to be able to say "auto NWAY", "limited NWAY", and
"no NWAY". Unfortunately, this does not appear to be possible with
the current mediaopt structure.
| -rw-r--r-- | sys/dev/mii/inphy.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c index c1046c1..79b40d2 100644 --- a/sys/dev/mii/inphy.c +++ b/sys/dev/mii/inphy.c @@ -195,19 +195,11 @@ inphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: -#if 0 - /* - * XXX - * we need to differentiate between 'auto media' - * and "NWAY autonegotiate enabled". For now, - * just re-start full autodetect again. - */ /* * If we're already in auto mode, just return. */ if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) return (0); -#endif (void) mii_phy_auto(sc, 0); break; case IFM_100_T4: @@ -220,9 +212,7 @@ inphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) * BMCR data is stored in the ifmedia entry. */ PHY_WRITE(sc, MII_ANAR, mii_anar(ife->ifm_media)); - PHY_WRITE(sc, MII_BMCR, ife->ifm_data | - (sc->mii_capabilities & BMSR_ANEG ? - BMCR_AUTOEN | BMCR_STARTNEG : 0)); + PHY_WRITE(sc, MII_BMCR, ife->ifm_data); } break; |
