d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out previous commit until I figure out a way to do it properly.

Browse Source 
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.
This commit is contained in:
Jonathan Lemon 2001-03-28 07:01:45 +00:00
parent d2de224265
commit e3768ebb1b
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/mii/inphy.c
View File

@ -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;