diff options
| author | Ed Swierk <eswierk@aristanetworks.com> | 2009-04-06 17:49:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-06 17:49:12 -0700 |
| commit | 35a7433c789ba6df6d96b70fa745ae9e6cac0038 (patch) | |
| tree | c4394ca94864e7cb6edd014740164a0dd97e6b1d /drivers/net | |
| parent | d1d88e5de491f7b0862a0adaed427211c0e4a0a6 (diff) | |
| download | linux-3.10-35a7433c789ba6df6d96b70fa745ae9e6cac0038.tar.gz linux-3.10-35a7433c789ba6df6d96b70fa745ae9e6cac0038.tar.bz2 linux-3.10-35a7433c789ba6df6d96b70fa745ae9e6cac0038.zip | |
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')
| -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 a858c6ff80d..663a7b3261e 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev) pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE); + /* restore phy state, including autoneg */ + phy_init(dev); + netif_device_attach(dev); if (netif_running(dev)) { rc = nv_open(dev); |