aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/r8169.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 976bb31b2092..182c79474434 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1258,16 +1258,7 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
1258 giga_ctrl &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF); 1258 giga_ctrl &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
1259 1259
1260 /* The 8100e/8101e/8102e do Fast Ethernet only. */ 1260 /* The 8100e/8101e/8102e do Fast Ethernet only. */
1261 if (tp->mac_version != RTL_GIGA_MAC_VER_07 && 1261 if (tp->mii.supports_gmii) {
1262 tp->mac_version != RTL_GIGA_MAC_VER_08 &&
1263 tp->mac_version != RTL_GIGA_MAC_VER_09 &&
1264 tp->mac_version != RTL_GIGA_MAC_VER_10 &&
1265 tp->mac_version != RTL_GIGA_MAC_VER_13 &&
1266 tp->mac_version != RTL_GIGA_MAC_VER_14 &&
1267 tp->mac_version != RTL_GIGA_MAC_VER_15 &&
1268 tp->mac_version != RTL_GIGA_MAC_VER_16 &&
1269 tp->mac_version != RTL_GIGA_MAC_VER_29 &&
1270 tp->mac_version != RTL_GIGA_MAC_VER_30) {
1271 if (adv & ADVERTISED_1000baseT_Half) 1262 if (adv & ADVERTISED_1000baseT_Half)
1272 giga_ctrl |= ADVERTISE_1000HALF; 1263 giga_ctrl |= ADVERTISE_1000HALF;
1273 if (adv & ADVERTISED_1000baseT_Full) 1264 if (adv & ADVERTISED_1000baseT_Full)