---

yaml --- r: 215398 b: refs/heads/master c: fccec10 h: refs/heads/master v: v3
git-mirror · Oct 21, 2010 · 92259ba · 92259ba
1 parent 551c8f9
commit 92259ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 323bb6857533d7132e1d4fd9cc8edc599a06f5e6
+refs/heads/master: fccec10b33503a2b1197c8e7a3abd30443bedb08
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -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;