diff options
| author | marius <marius@FreeBSD.org> | 2007-01-12 22:27:46 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2007-01-12 22:27:46 +0000 |
| commit | bbbb7ec1ef33af60587c23e73ed39e2989ea5d3d (patch) | |
| tree | 10adfa7b7ef76b44ab6e5c2e019236a95140058d /sys/dev/mii | |
| parent | f96ba0731cb8677b7dcc00622f59de9cf96b912c (diff) | |
| download | FreeBSD-src-bbbb7ec1ef33af60587c23e73ed39e2989ea5d3d.zip FreeBSD-src-bbbb7ec1ef33af60587c23e73ed39e2989ea5d3d.tar.gz | |
Use mii_phy_add_media()/mii_phy_setmedia()-compatible media table
indices when manually adding media. Some of these I've missed while
converting drivers to take advantage of said fuctions recently,
others where longstanding bugs.
Diffstat (limited to 'sys/dev/mii')
| -rw-r--r-- | sys/dev/mii/amphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/exphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/inphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/lxtphy.c | 4 | ||||
| -rw-r--r-- | sys/dev/mii/nsphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/rlphy.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index eaa5d8a..2b9ec72d 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -120,7 +120,7 @@ amphy_attach(device_t dev) #if 0 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); #endif mii_phy_reset(sc); diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index bd52e84..fc418be 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -185,7 +185,7 @@ exphy_attach(device_t dev) #endif ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); exphy_reset(sc); diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c index a8f2794..44c3a4d 100644 --- a/sys/dev/mii/inphy.c +++ b/sys/dev/mii/inphy.c @@ -115,7 +115,7 @@ inphy_attach(device_t dev) ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100, NULL); + MII_MEDIA_100_TX, NULL); mii_phy_reset(sc); diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index 5d23203..9945fb2 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -161,10 +161,10 @@ lxtphy_attach(device_t dev) #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst), - BMCR_S100); + MII_MEDIA_100_TX); printf("100baseFX, "); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, IFM_FDX, sc->mii_inst), - BMCR_S100|BMCR_FDX); + MII_MEDIA_100_TX_FDX); printf("100baseFX-FDX, "); #undef ADD diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 49796e8..01429ab 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -178,7 +178,7 @@ nsphy_attach(device_t dev) if (strcmp(nic, "pcn") != 0) #if 1 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, - sc->mii_inst), BMCR_LOOP|BMCR_S100); + sc->mii_inst), MII_MEDIA_100_TX); #else if (strcmp(nic, "pcn") == 0) sc->mii_flags |= MIIF_NOLOOP; diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index f672000..47d7609 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -153,7 +153,7 @@ rlphy_attach(device_t dev) #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); mii_phy_reset(sc); |
