diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000e/e1000.h | 1 | ||||
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 7 | ||||
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index 473c41479ec..37bcb190eef 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
@@ -389,6 +389,7 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter); | |||
389 | extern void e1000e_free_rx_resources(struct e1000_adapter *adapter); | 389 | extern void e1000e_free_rx_resources(struct e1000_adapter *adapter); |
390 | extern void e1000e_free_tx_resources(struct e1000_adapter *adapter); | 390 | extern void e1000e_free_tx_resources(struct e1000_adapter *adapter); |
391 | extern void e1000e_update_stats(struct e1000_adapter *adapter); | 391 | extern void e1000e_update_stats(struct e1000_adapter *adapter); |
392 | extern bool e1000_has_link(struct e1000_adapter *adapter); | ||
392 | extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter); | 393 | extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter); |
393 | extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter); | 394 | extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter); |
394 | 395 | ||
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 840e8c4fb75..34f1f639429 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -173,11 +173,8 @@ static int e1000_get_settings(struct net_device *netdev, | |||
173 | static u32 e1000_get_link(struct net_device *netdev) | 173 | static u32 e1000_get_link(struct net_device *netdev) |
174 | { | 174 | { |
175 | struct e1000_adapter *adapter = netdev_priv(netdev); | 175 | struct e1000_adapter *adapter = netdev_priv(netdev); |
176 | struct e1000_hw *hw = &adapter->hw; | 176 | |
177 | u32 status; | 177 | return e1000_has_link(adapter); |
178 | |||
179 | status = er32(STATUS); | ||
180 | return (status & E1000_STATUS_LU) ? 1 : 0; | ||
181 | } | 178 | } |
182 | 179 | ||
183 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) | 180 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index b3f0b479701..b1b534d267e 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -3421,7 +3421,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) | |||
3421 | ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" ))); | 3421 | ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" ))); |
3422 | } | 3422 | } |
3423 | 3423 | ||
3424 | static bool e1000_has_link(struct e1000_adapter *adapter) | 3424 | bool e1000_has_link(struct e1000_adapter *adapter) |
3425 | { | 3425 | { |
3426 | struct e1000_hw *hw = &adapter->hw; | 3426 | struct e1000_hw *hw = &adapter->hw; |
3427 | bool link_active = 0; | 3427 | bool link_active = 0; |