diff options
author | Ed Swierk <eswierk@aristanetworks.com> | 2009-04-06 20:49:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-06 20:49:12 -0400 |
commit | 35a7433c789ba6df6d96b70fa745ae9e6cac0038 (patch) | |
tree | c4394ca94864e7cb6edd014740164a0dd97e6b1d /drivers/net/forcedeth.c | |
parent | d1d88e5de491f7b0862a0adaed427211c0e4a0a6 (diff) |
forcedeth: Fix resume from hibernation regression.
Reset phy state on resume, fixing a regression caused by powering down
the phy on hibernate.
Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index a858c6ff80dd..663a7b3261ee 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev) | |||
6117 | 6117 | ||
6118 | pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE); | 6118 | pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE); |
6119 | 6119 | ||
6120 | /* restore phy state, including autoneg */ | ||
6121 | phy_init(dev); | ||
6122 | |||
6120 | netif_device_attach(dev); | 6123 | netif_device_attach(dev); |
6121 | if (netif_running(dev)) { | 6124 | if (netif_running(dev)) { |
6122 | rc = nv_open(dev); | 6125 | rc = nv_open(dev); |