| From | Andi Kleen <> | Subject | [PATCH] [216/223] r8169: (re)init phy on resume | Date | Mon, 13 Dec 2010 00:48:43 +0100 (CET) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Stanislaw Gruszka <sgruszka@redhat.com>
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> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- drivers/net/r8169.c | 5 +++++ 1 file changed, 5 insertions(+)
Index: linux/drivers/net/r8169.c =================================================================== --- linux.orig/drivers/net/r8169.c +++ linux/drivers/net/r8169.c @@ -4893,6 +4893,9 @@ static int rtl8169_resume(struct 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); @@ -4933,6 +4936,8 @@ static int rtl8169_runtime_resume(struct tp->saved_wolopts = 0; spin_unlock_irq(&tp->lock); + rtl8169_init_phy(dev, tp); + __rtl8169_resume(dev); return 0;
|