aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-02-06 18:21:10 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-07 05:43:14 -0500
commita8564f033efade1b6f027c4bb807cdf8cf5c9570 (patch)
tree609ec809a55ced0ec318ab8712e44fac47f2c04d /drivers/net/igb/igb_main.c
parent4a3c6433e48592f260278966742a99e0d77de3cc (diff)
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/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 56c14557cea3..accab3f7357e 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)
4341 /* e1000_power_up_phy(adapter); */ 4341 /* e1000_power_up_phy(adapter); */
4342 4342
4343 igb_reset(adapter); 4343 igb_reset(adapter);
4344
4345 /* let the f/w know that the h/w is now under the control of the
4346 * driver. */
4347 igb_get_hw_control(adapter);
4348
4344 wr32(E1000_WUS, ~0); 4349 wr32(E1000_WUS, ~0);
4345 4350
4346 if (netif_running(netdev)) { 4351 if (netif_running(netdev)) {
@@ -4351,10 +4356,6 @@ static int igb_resume(struct pci_dev *pdev)
4351 4356
4352 netif_device_attach(netdev); 4357 netif_device_attach(netdev);
4353 4358
4354 /* let the f/w know that the h/w is now under the control of the
4355 * driver. */
4356 igb_get_hw_control(adapter);
4357
4358 return 0; 4359 return 0;
4359} 4360}
4360#endif 4361#endif