e1000: Report link status in ethtool when interface is down
Subsystems (2)
PATCH 1/2 e1000: Report link status in ethtool when interface is down
From: Nick Nunley <[email protected]>
With this change ethtool will correctly report link status when the interface is down. Currently ethtool reports the link as not detected when the interface is down.
---
drivers/net/e1000/e1000.h | 1 + drivers/net/e1000/e1000_ethtool.c | 19 ++++++++++++++++++- drivers/net/e1000/e1000_main.c | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000.h +1 -0
@@ -349,6 +349,7 @@ extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);extern void e1000_free_all_rx_resources (struct e1000_adapter *adapter);extern void e1000_free_all_tx_resources (struct e1000_adapter *adapter);extern void e1000_update_stats (struct e1000_adapter *adapter); +extern bool e1000_has_link (struct e1000_adapter *adapter);extern void e1000_power_up_phy (struct e1000_adapter *);extern void e1000_set_ethtool_ops (struct net_device *netdev);extern void e1000_check_options (struct e1000_adapter *adapter);
drivers/net/e1000/e1000_ethtool.c +18 -1
@@ -215,6 +215,23 @@ static int e1000_set_settings(struct net_device *netdev,return 0 ; } +static u32 e1000_get_link (struct net_device *netdev) +{ +struct e1000_adapter *adapter =netdev_priv (netdev); + +/* +* If the link is not reported up to netdev, interrupts are disabled, +* and so the physical link state may have changed since we last +* looked. Set get_link_status to make sure that the true link +* state is interrogated, rather than pulling a cached and possibly +* stale link state from the driver. +*/ +if (!netif_carrier_ok (netdev)) + adapter->hw.get_link_status =1 ; + +return e1000_has_link (adapter); +} +static void e1000_get_pauseparam (struct net_device *netdev,struct ethtool_pauseparam *pause) {
@@ -1892,7 +1909,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 = ethtool_op_get_link, + .get_link = e1000_get_link, .get_eeprom_len = e1000_get_eeprom_len, .get_eeprom = e1000_get_eeprom, .set_eeprom = e1000_set_eeprom,
drivers/net/e1000/e1000_main.c +1 -1
@@ -2246,7 +2246,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data) } } -static bool e1000_has_link (struct e1000_adapter *adapter) +bool e1000_has_link (struct e1000_adapter *adapter) {struct e1000_hw *hw = &adapter->hw;bool link_active = false;
PATCH 2/2 e1000: call pci_save_state after pci_restore_state
From: Nick Nunley <[email protected]>
This patch adds a call to pci_save_state() immediately after the call to pci_restore_state(). Due to a change in the behavior of pci_restore_state() it is necessary to call pci_save_state() to keep the state_saved flag. This patch is based on a similar patch for ixgbe.
---
drivers/net/e1000/e1000_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/e1000/e1000_main.c +4 -0
@@ -847,6 +847,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev, goto err_pci_reg;pci_set_master (pdev); + err =pci_save_state (pdev); +if (err) + goto err_alloc_etherdev; err = -ENOMEM ; netdev =alloc_etherdev (sizeof (struct e1000_adapter ));
@@ -4596,6 +4599,7 @@ static int e1000_resume(struct pci_dev *pdev)pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); +pci_save_state (pdev);if (adapter->need_ioport) err =pci_enable_device (pdev);
Re: [net-next-2.6 PATCH 2/2] e1000: call pci_save_state after pci_restore_state
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 16:49:48 -0800
Quoted 10 lines
From: Nick Nunley <[email protected]>
This patch adds a call to
pci_save_state()immediately after the call topci_restore_state(). Due to a change in the behavior ofpci_restore_state()it is necessary to callpci_save_state()to keep thestate_savedflag. This patch is based on a similar patch for ixgbe.Signed-off-by Nicholas Nunley <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 16:49:28 -0800
Quoted 8 lines
From: Nick Nunley <[email protected]>
With this change ethtool will correctly report link status when the interface is down. Currently ethtool reports the link as not detected when the interface is down.
Signed-off-by Nicholas Nunley <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.