diff options
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
-rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 3ba672e9e353..e5397c8197b9 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c | |||
@@ -3343,7 +3343,6 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported, | |||
3343 | if (state->interface != PHY_INTERFACE_MODE_NA && | 3343 | if (state->interface != PHY_INTERFACE_MODE_NA && |
3344 | state->interface != PHY_INTERFACE_MODE_QSGMII && | 3344 | state->interface != PHY_INTERFACE_MODE_QSGMII && |
3345 | state->interface != PHY_INTERFACE_MODE_SGMII && | 3345 | state->interface != PHY_INTERFACE_MODE_SGMII && |
3346 | state->interface != PHY_INTERFACE_MODE_2500BASEX && | ||
3347 | !phy_interface_mode_is_8023z(state->interface) && | 3346 | !phy_interface_mode_is_8023z(state->interface) && |
3348 | !phy_interface_mode_is_rgmii(state->interface)) { | 3347 | !phy_interface_mode_is_rgmii(state->interface)) { |
3349 | bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); | 3348 | bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); |
@@ -3357,14 +3356,9 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported, | |||
3357 | /* Asymmetric pause is unsupported */ | 3356 | /* Asymmetric pause is unsupported */ |
3358 | phylink_set(mask, Pause); | 3357 | phylink_set(mask, Pause); |
3359 | 3358 | ||
3360 | /* We cannot use 1Gbps when using the 2.5G interface. */ | 3359 | /* Half-duplex at speeds higher than 100Mbit is unsupported */ |
3361 | if (state->interface == PHY_INTERFACE_MODE_2500BASEX) { | 3360 | phylink_set(mask, 1000baseT_Full); |
3362 | phylink_set(mask, 2500baseT_Full); | 3361 | phylink_set(mask, 1000baseX_Full); |
3363 | phylink_set(mask, 2500baseX_Full); | ||
3364 | } else { | ||
3365 | phylink_set(mask, 1000baseT_Full); | ||
3366 | phylink_set(mask, 1000baseX_Full); | ||
3367 | } | ||
3368 | 3362 | ||
3369 | if (!phy_interface_mode_is_8023z(state->interface)) { | 3363 | if (!phy_interface_mode_is_8023z(state->interface)) { |
3370 | /* 10M and 100M are only supported in non-802.3z mode */ | 3364 | /* 10M and 100M are only supported in non-802.3z mode */ |