diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-05-18 20:58:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-21 00:23:07 +0200 |
| commit | f0b99e3ab323c72c480140532b0526f087a08c23 (patch) | |
| tree | a3f700e78b102eea9de05de6a34cf70bddae8bf2 /drivers/net/ethernet/intel | |
| parent | net: qcom/emac: Allocate buffers from local node (diff) | |
| download | linux-f0b99e3ab323c72c480140532b0526f087a08c23.tar.xz linux-f0b99e3ab323c72c480140532b0526f087a08c23.zip | |
Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()"
This reverts commit 6710f970d9979d8f03f6e292bb729b2ee1526d0e.
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>
Diffstat (limited to 'drivers/net/ethernet/intel')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5ddfb93ed491..a52d92e182ee 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -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(); |