]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
forcedeth: Fix resume from hibernation regression.
authorEd Swierk <eswierk@aristanetworks.com>
Tue, 7 Apr 2009 00:49:12 +0000 (17:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Apr 2009 00:49:12 +0000 (17:49 -0700)
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>
drivers/net/forcedeth.c

index a858c6ff80ddd7517df1fac3ef90eafc64d81a28..663a7b3261eef75f6ded37a2d12e73beb045db88 100644 (file)
@@ -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);