aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorPyun YongHyeon <yongari@FreeBSD.org>2007-11-16 10:25:36 +0000
committerPyun YongHyeon <yongari@FreeBSD.org>2007-11-16 10:25:36 +0000
commitd612cc59473b71bc6b004483c4ecdee1d19e2515 (patch)
tree6a96fff67828f66a4043afba1a520e87965e3db4 /sys/dev
parentfcfe60dc183dd42f19e34130c6ce6971ae3f0214 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/dc/dcphy.c8
-rw-r--r--sys/dev/mii/amphy.c6
-rw-r--r--sys/dev/mii/nsphy.c6
-rw-r--r--sys/dev/mii/rlphy.c6
-rw-r--r--sys/dev/mii/tdkphy.c6
-rw-r--r--sys/dev/mii/ukphy_subr.c4
-rw-r--r--sys/dev/txp/if_txp.c6
7 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 3b1de0fc496df..f01860be83290 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -364,12 +364,12 @@ dcphy_status(struct mii_softc *sc)
if (tstat & DC_TSTAT_LP_CAN_NWAY) {
anlpar = tstat >> 16;
- if (anlpar & ANLPAR_T4 &&
- sc->mii_capabilities & BMSR_100TXHDX)
- mii->mii_media_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD &&
+ if (anlpar & ANLPAR_TX_FD &&
sc->mii_capabilities & BMSR_100TXFDX)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4 &&
+ sc->mii_capabilities & BMSR_100T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX &&
sc->mii_capabilities & BMSR_100TXHDX)
mii->mii_media_active |= IFM_100_TX;
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 2b9ec72d60257..f4a9ec61ec1cc 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -228,10 +228,10 @@ amphy_status(struct mii_softc *sc)
if (PHY_READ(sc, MII_ANER) & ANER_LPAN) {
anlpar = PHY_READ(sc, MII_ANAR) &
PHY_READ(sc, MII_ANLPAR);
- if (anlpar & ANLPAR_T4)
- mii->mii_media_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD)
+ if (anlpar & ANLPAR_TX_FD)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
mii->mii_media_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 01429ab217b0b..88f0daf01187f 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -331,10 +331,10 @@ nsphy_status(struct mii_softc *sc)
if (PHY_READ(sc, MII_ANER) & ANER_LPAN) {
anlpar = PHY_READ(sc, MII_ANAR) &
PHY_READ(sc, MII_ANLPAR);
- if (anlpar & ANLPAR_T4)
- mii->mii_media_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD)
+ if (anlpar & ANLPAR_TX_FD)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
mii->mii_media_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index aa9ff76461613..fbbdfd044b382 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -261,10 +261,10 @@ rlphy_status(struct mii_softc *phy)
if ((anlpar = PHY_READ(phy, MII_ANAR) &
PHY_READ(phy, MII_ANLPAR))) {
- if (anlpar & ANLPAR_T4)
- mii->mii_media_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD)
+ if (anlpar & ANLPAR_TX_FD)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
mii->mii_media_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 1b31ee2de9b4b..83a394a339abd 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -239,10 +239,10 @@ tdkphy_status(struct mii_softc *phy)
* ANLPAR doesn't get set on my card, but we check it anyway,
* since it is mentioned in the 78Q2120 specs.
*/
- if (anlpar & ANLPAR_T4)
- mii->mii_media_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD)
+ if (anlpar & ANLPAR_TX_FD)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
mii->mii_media_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 9d7df3d594b8f..fdfc9727d822d 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -112,10 +112,10 @@ ukphy_status(struct mii_softc *phy)
else if ((gtcr & GTCR_ADV_1000THDX) &&
(gtsr & GTSR_LP_1000THDX))
mii->mii_media_active |= IFM_1000_T;
- else if (anlpar & ANLPAR_T4)
- mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX_FD)
mii->mii_media_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ mii->mii_media_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
mii->mii_media_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 6d7eda1600f7a..3478970493e34 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -1695,10 +1695,10 @@ txp_ifmedia_sts(ifp, ifmr)
return;
}
- if (anlpar & ANLPAR_T4)
- ifmr->ifm_active |= IFM_100_T4;
- else if (anlpar & ANLPAR_TX_FD)
+ if (anlpar & ANLPAR_TX_FD)
ifmr->ifm_active |= IFM_100_TX|IFM_FDX;
+ else if (anlpar & ANLPAR_T4)
+ ifmr->ifm_active |= IFM_100_T4;
else if (anlpar & ANLPAR_TX)
ifmr->ifm_active |= IFM_100_TX;
else if (anlpar & ANLPAR_10_FD)