diff options
Diffstat (limited to 'drivers/net/e1000e/ethtool.c')
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 3d6435617527..1bf4d2a5d34f 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -167,6 +167,15 @@ static int e1000_get_settings(struct net_device *netdev, | |||
167 | 167 | ||
168 | ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) || | 168 | ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) || |
169 | hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE; | 169 | hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE; |
170 | |||
171 | /* MDI-X => 2; MDI =>1; Invalid =>0 */ | ||
172 | if ((hw->phy.media_type == e1000_media_type_copper) && | ||
173 | !hw->mac.get_link_status) | ||
174 | ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X : | ||
175 | ETH_TP_MDI; | ||
176 | else | ||
177 | ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID; | ||
178 | |||
170 | return 0; | 179 | return 0; |
171 | } | 180 | } |
172 | 181 | ||