diff options
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index af09296ef0d..7b92897ca66 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5645,6 +5645,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5645 | goto out_error; | 5645 | goto out_error; |
5646 | } | 5646 | } |
5647 | 5647 | ||
5648 | netif_carrier_off(dev); | ||
5649 | |||
5648 | dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n", | 5650 | dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n", |
5649 | dev->name, np->phy_oui, np->phyaddr, dev->dev_addr); | 5651 | dev->name, np->phy_oui, np->phyaddr, dev->dev_addr); |
5650 | 5652 | ||
@@ -5742,7 +5744,7 @@ static void __devexit nv_remove(struct pci_dev *pci_dev) | |||
5742 | pci_set_drvdata(pci_dev, NULL); | 5744 | pci_set_drvdata(pci_dev, NULL); |
5743 | } | 5745 | } |
5744 | 5746 | ||
5745 | #ifdef CONFIG_PM | 5747 | #ifdef CONFIG_PM_SLEEP |
5746 | static int nv_suspend(struct device *device) | 5748 | static int nv_suspend(struct device *device) |
5747 | { | 5749 | { |
5748 | struct pci_dev *pdev = to_pci_dev(device); | 5750 | struct pci_dev *pdev = to_pci_dev(device); |
@@ -5793,6 +5795,11 @@ static int nv_resume(struct device *device) | |||
5793 | static SIMPLE_DEV_PM_OPS(nv_pm_ops, nv_suspend, nv_resume); | 5795 | static SIMPLE_DEV_PM_OPS(nv_pm_ops, nv_suspend, nv_resume); |
5794 | #define NV_PM_OPS (&nv_pm_ops) | 5796 | #define NV_PM_OPS (&nv_pm_ops) |
5795 | 5797 | ||
5798 | #else | ||
5799 | #define NV_PM_OPS NULL | ||
5800 | #endif /* CONFIG_PM_SLEEP */ | ||
5801 | |||
5802 | #ifdef CONFIG_PM | ||
5796 | static void nv_shutdown(struct pci_dev *pdev) | 5803 | static void nv_shutdown(struct pci_dev *pdev) |
5797 | { | 5804 | { |
5798 | struct net_device *dev = pci_get_drvdata(pdev); | 5805 | struct net_device *dev = pci_get_drvdata(pdev); |
@@ -5820,7 +5827,6 @@ static void nv_shutdown(struct pci_dev *pdev) | |||
5820 | } | 5827 | } |
5821 | } | 5828 | } |
5822 | #else | 5829 | #else |
5823 | #define NV_PM_OPS NULL | ||
5824 | #define nv_shutdown NULL | 5830 | #define nv_shutdown NULL |
5825 | #endif /* CONFIG_PM */ | 5831 | #endif /* CONFIG_PM */ |
5826 | 5832 | ||