Page MenuHomeFreeBSD

D45919.id140694.diff
No OneTemporary

D45919.id140694.diff

diff --git a/sys/dev/mii/mv88e151x.c b/sys/dev/mii/mv88e151x.c
--- a/sys/dev/mii/mv88e151x.c
+++ b/sys/dev/mii/mv88e151x.c
@@ -107,10 +107,9 @@
PHY_RESET(sc);
sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
cop_cap = sc->mii_capabilities;
- if (sc->mii_capabilities & BMSR_EXTSTAT) {
+ if (sc->mii_capabilities & BMSR_EXTSTAT)
sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
- cop_extcap = sc->mii_extcapabilities;
- }
+ cop_extcap = sc->mii_extcapabilities;
device_printf(dev, " ");
if (MII_MODEL(ma->mii_id2) == MII_MODEL_xxMARVELL_E1512)
sc->mii_capabilities &= ~BMSR_ANEG;
@@ -224,10 +223,12 @@
else if (reg & MV88E151X_STATUS_LINK &&
reg & MV88E151X_STATUS_SYNC &&
(reg & MV88E151X_STATUS_ENERGY) == 0) {
- if ((reg & MV88E151X_STATUS_SPEED_MASK) ==
+ if (((reg & MV88E151X_STATUS_SPEED_MASK) >>
+ MV88E151X_STATUS_SPEED_SHIFT) ==
MV88E151X_STATUS_SPEED_1000)
mii->mii_media_active |= IFM_1000_SX;
- else if ((reg & MV88E151X_STATUS_SPEED_MASK) ==
+ else if (((reg & MV88E151X_STATUS_SPEED_MASK) >>
+ MV88E151X_STATUS_SPEED_SHIFT) ==
MV88E151X_STATUS_SPEED_100)
mii->mii_media_active |= IFM_100_FX;
else

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 14, 3:39 PM (9 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25292105
Default Alt Text
D45919.id140694.diff (1 KB)

Event Timeline