Skip to content

Commit

Permalink
Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()"
Browse files Browse the repository at this point in the history
This reverts commit 6710f97.

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>
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed May 20, 2018
1 parent 1bc49fd commit f0b99e3
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -6698,15 +6698,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
rtnl_lock();
netif_device_detach(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();
if (netif_running(netdev))
ixgbe_close_suspend(adapter);
rtnl_lock();
}

ixgbe_clear_interrupt_scheme(adapter);
rtnl_unlock();
Expand Down

0 comments on commit f0b99e3

Please sign in to comment.