|
@@ -194,20 +194,6 @@ static int e1000_get_settings(struct net_device *netdev,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static u32 e1000_get_link(struct net_device *netdev)
|
|
|
-{
|
|
|
- struct e1000_adapter *adapter = netdev_priv(netdev);
|
|
|
- struct e1000_hw *hw = &adapter->hw;
|
|
|
-
|
|
|
- /*
|
|
|
- * Avoid touching hardware registers when possible, otherwise
|
|
|
- * link negotiation can get messed up when user-level scripts
|
|
|
- * are rapidly polling the driver to see if link is up.
|
|
|
- */
|
|
|
- return netif_running(netdev) ? netif_carrier_ok(netdev) :
|
|
|
- !!(er32(STATUS) & E1000_STATUS_LU);
|
|
|
-}
|
|
|
-
|
|
|
static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
|
|
|
{
|
|
|
struct e1000_mac_info *mac = &adapter->hw.mac;
|
|
@@ -2024,7 +2010,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
|
|
|
.get_msglevel = e1000_get_msglevel,
|
|
|
.set_msglevel = e1000_set_msglevel,
|
|
|
.nway_reset = e1000_nway_reset,
|
|
|
- .get_link = e1000_get_link,
|
|
|
+ .get_link = ethtool_op_get_link,
|
|
|
.get_eeprom_len = e1000_get_eeprom_len,
|
|
|
.get_eeprom = e1000_get_eeprom,
|
|
|
.set_eeprom = e1000_set_eeprom,
|