Commit f0b99e3a authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller

Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()"

This reverts commit 6710f970.

Gotta love when developers have offline discussions, thinking everyone
is reading their responses/dialog.

The change had the potential for a number of race conditions on
shutdown, which is why we are reverting the change.
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bc49fd1
...@@ -6698,15 +6698,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) ...@@ -6698,15 +6698,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
rtnl_lock(); rtnl_lock();
netif_device_detach(netdev); netif_device_detach(netdev);
if (netif_running(netdev)) { if (netif_running(netdev))
/* Suspend takes a long time, device_shutdown may be
* parallelized this function, so drop lock for the
* duration of this call.
*/
rtnl_unlock();
ixgbe_close_suspend(adapter); ixgbe_close_suspend(adapter);
rtnl_lock();
}
ixgbe_clear_interrupt_scheme(adapter); ixgbe_clear_interrupt_scheme(adapter);
rtnl_unlock(); rtnl_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment