diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-06 23:21:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-07 02:43:14 -0800 |
| commit | a8564f033efade1b6f027c4bb807cdf8cf5c9570 (patch) | |
| tree | 609ec809a55ced0ec318ab8712e44fac47f2c04d /drivers/net/igb | |
| parent | 4a3c6433e48592f260278966742a99e0d77de3cc (diff) | |
| download | op-kernel-dev-a8564f033efade1b6f027c4bb807cdf8cf5c9570.zip op-kernel-dev-a8564f033efade1b6f027c4bb807cdf8cf5c9570.tar.gz | |
igb: move get_hw_control within igb_resume.
Move igb_get_hw_control up so that it is called just after the reset in
igb_resume. This notifies the HW sooner that the driver is reassuming
control of the device.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 56c1455..accab3f 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -4341,6 +4341,11 @@ static int igb_resume(struct pci_dev *pdev) /* e1000_power_up_phy(adapter); */ igb_reset(adapter); + + /* let the f/w know that the h/w is now under the control of the + * driver. */ + igb_get_hw_control(adapter); + wr32(E1000_WUS, ~0); if (netif_running(netdev)) { @@ -4351,10 +4356,6 @@ static int igb_resume(struct pci_dev *pdev) netif_device_attach(netdev); - /* let the f/w know that the h/w is now under the control of the - * driver. */ - igb_get_hw_control(adapter); - return 0; } #endif |
