equal
deleted
inserted
replaced
2873 { |
2873 { |
2874 struct net_device *netdev = pci_get_drvdata(pdev); |
2874 struct net_device *netdev = pci_get_drvdata(pdev); |
2875 struct nic *nic = netdev_priv(netdev); |
2875 struct nic *nic = netdev_priv(netdev); |
2876 |
2876 |
2877 if (nic->ecdev) |
2877 if (nic->ecdev) |
2878 return; |
2878 return 0; |
2879 |
2879 |
2880 if (netif_running(netdev)) |
2880 if (netif_running(netdev)) |
2881 netif_poll_disable(nic->netdev); |
2881 netif_poll_disable(nic->netdev); |
2882 del_timer_sync(&nic->watchdog); |
2882 del_timer_sync(&nic->watchdog); |
2883 netif_carrier_off(nic->netdev); |
2883 netif_carrier_off(nic->netdev); |
2904 { |
2904 { |
2905 struct net_device *netdev = pci_get_drvdata(pdev); |
2905 struct net_device *netdev = pci_get_drvdata(pdev); |
2906 struct nic *nic = netdev_priv(netdev); |
2906 struct nic *nic = netdev_priv(netdev); |
2907 |
2907 |
2908 if (nic->ecdev) |
2908 if (nic->ecdev) |
2909 return; |
2909 return 0; |
2910 |
2910 |
2911 pci_set_power_state(pdev, PCI_D0); |
2911 pci_set_power_state(pdev, PCI_D0); |
2912 pci_restore_state(pdev); |
2912 pci_restore_state(pdev); |
2913 /* ack any pending wake events, disable PME */ |
2913 /* ack any pending wake events, disable PME */ |
2914 pci_enable_wake(pdev, 0, 0); |
2914 pci_enable_wake(pdev, 0, 0); |