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>
This commit is contained in:
parent
4a3c6433e4
commit
a8564f033e
@ -4341,6 +4341,11 @@ static int igb_resume(struct pci_dev *pdev)
|
|||||||
/* e1000_power_up_phy(adapter); */
|
/* e1000_power_up_phy(adapter); */
|
||||||
|
|
||||||
igb_reset(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);
|
wr32(E1000_WUS, ~0);
|
||||||
|
|
||||||
if (netif_running(netdev)) {
|
if (netif_running(netdev)) {
|
||||||
@ -4351,10 +4356,6 @@ static int igb_resume(struct pci_dev *pdev)
|
|||||||
|
|
||||||
netif_device_attach(netdev);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user