]>
Commit | Line | Data |
---|---|---|
9a58d64e GKH |
1 | From fccec10b33503a2b1197c8e7a3abd30443bedb08 Mon Sep 17 00:00:00 2001 |
2 | From: Stanislaw Gruszka <sgruszka@redhat.com> | |
3 | Date: Wed, 20 Oct 2010 22:25:42 +0000 | |
4 | Subject: r8169: (re)init phy on resume | |
5 | ||
6 | From: Stanislaw Gruszka <sgruszka@redhat.com> | |
7 | ||
8 | commit fccec10b33503a2b1197c8e7a3abd30443bedb08 upstream. | |
9 | ||
10 | Fix switching device to low-speed mode after resume reported in: | |
11 | https://bugzilla.redhat.com/show_bug.cgi?id=502974 | |
12 | ||
13 | Reported-and-tested-by: Laurentiu Badea <bugzilla-redhat@wotevah.com> | |
14 | Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> | |
15 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
16 | Cc: Francois Romieu <romieu@fr.zoreil.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
18 | ||
19 | --- | |
20 | drivers/net/r8169.c | 5 +++++ | |
21 | 1 file changed, 5 insertions(+) | |
22 | ||
23 | --- a/drivers/net/r8169.c | |
24 | +++ b/drivers/net/r8169.c | |
25 | @@ -4889,6 +4889,9 @@ static int rtl8169_resume(struct device | |
26 | { | |
27 | struct pci_dev *pdev = to_pci_dev(device); | |
28 | struct net_device *dev = pci_get_drvdata(pdev); | |
29 | + struct rtl8169_private *tp = netdev_priv(dev); | |
30 | + | |
31 | + rtl8169_init_phy(dev, tp); | |
32 | ||
33 | if (netif_running(dev)) | |
34 | __rtl8169_resume(dev); | |
35 | @@ -4929,6 +4932,8 @@ static int rtl8169_runtime_resume(struct | |
36 | tp->saved_wolopts = 0; | |
37 | spin_unlock_irq(&tp->lock); | |
38 | ||
39 | + rtl8169_init_phy(dev, tp); | |
40 | + | |
41 | __rtl8169_resume(dev); | |
42 | ||
43 | return 0; |