|
@@ -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);
|
|
|
|
|
|
- netif_poll_disable(nic->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);
|
|
|
|
|
|
- netif_poll_disable(nic->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);
|
|
|
|