Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −8
Original line number Diff line number Diff line
@@ -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();