diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-10-20 22:25:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:33:34 -0800 |
| commit | 719f3a304007498a64d728f4b04b1d26faafa834 (patch) | |
| tree | e4be002ac54f0cce0aa4bd30998ec69727427cb4 | |
| parent | 1f72786efd70e91ba18e51da3bdf74d006253ddc (diff) | |
| download | lwn-719f3a304007498a64d728f4b04b1d26faafa834.tar.gz lwn-719f3a304007498a64d728f4b04b1d26faafa834.zip | |
r8169: (re)init phy on resume
commit fccec10b33503a2b1197c8e7a3abd30443bedb08 upstream.
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>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/r8169.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 00bf3c58a497..d0629cadc54b 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4889,6 +4889,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); @@ -4929,6 +4932,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; |