aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 59fbc64d7c47..9881563898d7 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -865,9 +865,13 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
865 865
866 auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; 866 auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
867 867
868 if ((tp->mac_version == RTL_GIGA_MAC_VER_12) || 868 if ((tp->mac_version == RTL_GIGA_MAC_VER_11) ||
869 (tp->mac_version == RTL_GIGA_MAC_VER_17)) { 869 (tp->mac_version == RTL_GIGA_MAC_VER_12) ||
870 /* Vendor specific (0x1f) and reserved (0x0e) MII registers. */ 870 (tp->mac_version >= RTL_GIGA_MAC_VER_17)) {
871 /*
872 * Wake up the PHY.
873 * Vendor specific (0x1f) and reserved (0x0e) MII registers.
874 */
871 mdio_write(ioaddr, 0x1f, 0x0000); 875 mdio_write(ioaddr, 0x1f, 0x0000);
872 mdio_write(ioaddr, 0x0e, 0x0000); 876 mdio_write(ioaddr, 0x0e, 0x0000);
873 } 877 }