diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-26 06:01:29 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-26 06:01:29 +0000 |
| commit | 6305f12c83ebd24f17abde19361cfec044ac75a7 (patch) | |
| tree | 08b5799abbee81cbb004b151ad789ed837bd781f /sys/dev/mii/eephy.c | |
| parent | b2b15e45eca7137f0e7fb63a1de580af95881196 (diff) | |
1000baseTX -> 1000baseT
- More technically correct
- Matches FreeBSD and NetBSD
- Preserved #define for 1000baseTX for backwards compatibility
ok jason@
Diffstat (limited to 'sys/dev/mii/eephy.c')
| -rw-r--r-- | sys/dev/mii/eephy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 64ce3c1e7e3..8e8975819fc 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.7 2002/05/04 11:30:06 fgsch Exp $ */ +/* $OpenBSD: eephy.c,v 1.8 2002/11/26 06:01:28 nate Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -130,12 +130,12 @@ eephyattach(struct device *parent, struct device *self, void *aux) #ifndef __OpenBSD__ printf("%s: ", sc->mii_dev.dv_xname); #endif - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, IFM_FDX, sc->mii_inst), + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, sc->mii_inst), E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); PRINT("1000baseTX-FDX"); /* TODO - apparently 1000BT-simplex not supported? - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, 0, sc->mii_inst), + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst), E1000_CR_SPEED_1000); PRINT("1000baseTX"); */ @@ -249,7 +249,7 @@ eephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) (void)eephy_mii_phy_auto(sc, 1); break; - case IFM_1000_TX: + case IFM_1000_T: if (sc->mii_flags & MIIF_DOINGAUTO) return (0); @@ -382,7 +382,7 @@ eephy_status(struct mii_softc *sc) } if (ssr & E1000_SSR_1000MBS) - mii->mii_media_active |= IFM_1000_TX; + mii->mii_media_active |= IFM_1000_T; else if (ssr & E1000_SSR_100MBS) mii->mii_media_active |= IFM_100_TX; else |