diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-10-11 23:25:57 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-10-11 23:25:57 +0000 |
| commit | b3e0f59f6a1b88f413155ed43999863b9044ca07 (patch) | |
| tree | cc9572890598a56dd65bcee554b311c4dd8fe6c6 | |
| parent | a6451255438d964985e23d3625516f6c8189bd93 (diff) | |
revert rev 1.54. This causes breakage with the PHY on a 5704 A3 chipset;
the link comes up, there is activity with tcpdump, but it doesn't work
as expected.
Issue reported by kettenis. ok kettenis@
| -rw-r--r-- | sys/dev/mii/brgphy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 5cbe095d03a..ee65cbc439a 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brgphy.c,v 1.57 2006/10/09 00:29:25 brad Exp $ */ +/* $OpenBSD: brgphy.c,v 1.58 2006/10/11 23:25:56 brad Exp $ */ /* * Copyright (c) 2000 @@ -214,9 +214,10 @@ brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) if ((mii->mii_ifp->if_flags & IFF_UP) == 0) break; + PHY_RESET(sc); /* XXX hardware bug work-around */ + switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: - PHY_RESET(sc); /* XXX hardware bug work-around */ (void) brgphy_mii_phy_auto(sc); break; case IFM_1000_T: @@ -231,7 +232,6 @@ brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) case IFM_10_T: speed = BRGPHY_S10; setit: - PHY_RESET(sc); /* XXX hardware bug work-around */ brgphy_loop(sc); if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) { speed |= BRGPHY_BMCR_FDX; |