r8169: (re)init phy on resume
authorStanislaw Gruszka <sgruszka@redhat.com>
Wed, 20 Oct 2010 22:25:42 +0000 (22:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 08:32:47 +0000 (01:32 -0700)
Fix switching device to low-speed mode after resume reported in:
https://bugzilla.redhat.com/show_bug.cgi?id=502974

Reported-and-tested-by: Laurentiu Badea <bugzilla-redhat@wotevah.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/r8169.c

index 8715ec3a25a8c5c6b0be136e780778a87f8f786d..0204fe2b24901451d358e1df9131e000c02e7025 100644 (file)
@@ -4824,6 +4824,9 @@ static int rtl8169_resume(struct device *device)
 {
        struct pci_dev *pdev = to_pci_dev(device);
        struct net_device *dev = pci_get_drvdata(pdev);
+       struct rtl8169_private *tp = netdev_priv(dev);
+
+       rtl8169_init_phy(dev, tp);
 
        if (netif_running(dev))
                __rtl8169_resume(dev);
@@ -4864,6 +4867,8 @@ static int rtl8169_runtime_resume(struct device *device)
        tp->saved_wolopts = 0;
        spin_unlock_irq(&tp->lock);
 
+       rtl8169_init_phy(dev, tp);
+
        __rtl8169_resume(dev);
 
        return 0;