|
@@ -6200,7 +6200,8 @@ int ixgbe_close(struct net_device *netdev)
|
|
|
|
|
|
ixgbe_ptp_stop(adapter);
|
|
|
|
|
|
- ixgbe_close_suspend(adapter);
|
|
|
+ if (netif_device_present(netdev))
|
|
|
+ ixgbe_close_suspend(adapter);
|
|
|
|
|
|
ixgbe_fdir_filter_exit(adapter);
|
|
|
|
|
@@ -6245,14 +6246,12 @@ static int ixgbe_resume(struct pci_dev *pdev)
|
|
|
if (!err && netif_running(netdev))
|
|
|
err = ixgbe_open(netdev);
|
|
|
|
|
|
- rtnl_unlock();
|
|
|
|
|
|
- if (err)
|
|
|
- return err;
|
|
|
-
|
|
|
- netif_device_attach(netdev);
|
|
|
+ if (!err)
|
|
|
+ netif_device_attach(netdev);
|
|
|
+ rtnl_unlock();
|
|
|
|
|
|
- return 0;
|
|
|
+ return err;
|
|
|
}
|
|
|
#endif /* CONFIG_PM */
|
|
|
|
|
@@ -6267,14 +6266,14 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
|
|
|
int retval = 0;
|
|
|
#endif
|
|
|
|
|
|
+ rtnl_lock();
|
|
|
netif_device_detach(netdev);
|
|
|
|
|
|
- rtnl_lock();
|
|
|
if (netif_running(netdev))
|
|
|
ixgbe_close_suspend(adapter);
|
|
|
- rtnl_unlock();
|
|
|
|
|
|
ixgbe_clear_interrupt_scheme(adapter);
|
|
|
+ rtnl_unlock();
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
retval = pci_save_state(pdev);
|