Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()"
This reverts commit 6710f970d9
.
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1bc49fd18b
commit
f0b99e3ab3
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user