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

Commit 824545e7 authored by Auke Kok's avatar Auke Kok Committed by Auke Kok
Browse files

e100: account for closed interface when shutting down 



Account for the interface being closed before disabling polling
on a device, to fix shutdown on some systems that explcitly close
the netdevice before calling shutdown.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent ff1e55b0

drivers/net/e100.c

+8 −2
Original line number Diff line number Diff line
@@ -2719,7 +2719,10 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct nic *nic = netdev_priv(netdev);



#ifdef CONFIG_E100_NAPI

	if (netif_running(netdev))

		netif_poll_disable(nic->netdev);

#endif

	del_timer_sync(&nic->watchdog);

	netif_carrier_off(nic->netdev);
@@ -2763,7 +2766,10 @@ static void e100_shutdown(struct pci_dev *pdev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct nic *nic = netdev_priv(netdev);



#ifdef CONFIG_E100_NAPI

	if (netif_running(netdev))

		netif_poll_disable(nic->netdev);

#endif

	del_timer_sync(&nic->watchdog);

	netif_carrier_off(nic->netdev);