---

yaml --- r: 112195 b: refs/heads/master c: 20037fa h: refs/heads/master i: 112193: e135f26 112191: 18889ac v: v3
git-mirror · Oct 9, 2008 · 8f88b32 · 8f88b32
1 parent 0a62ae6
commit 8f88b32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3eab82b554eeb51f038ac327b6c68c6afdee978
+refs/heads/master: 20037fa407f26716866eff95221c4882babe1280
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -1925,6 +1925,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	RTL_W8(Cfg9346, Cfg9346_Unlock);
 	RTL_W8(Config1, RTL_R8(Config1) | PMEnable);
 	RTL_W8(Config5, RTL_R8(Config5) & PMEStatus);
+	if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0)
+		tp->features |= RTL_FEATURE_WOL;
+	if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0)
+		tp->features |= RTL_FEATURE_WOL;
 	tp->features |= rtl_try_msi(pdev, ioaddr, cfg);
 	RTL_W8(Cfg9346, Cfg9346_Lock);