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>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 5ddfb93ed491083857f7bcd7b507954c9a39c292..a52d92e182eea431458e6398a21cf5b0164b923b 100644 (file)
--- 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();