Skip to content

Commit

Permalink
igb: move get_hw_control within igb_resume.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Duyck authored and David S. Miller committed Feb 7, 2009
1 parent 4a3c643 commit a8564f0
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/igb/igb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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
Expand Down

0 comments on commit a8564f0

Please sign in to comment.