---

yaml --- r: 256317 b: refs/heads/master c: aaa89c0 h: refs/heads/master i: 256315: c5f818d v: v3
git-mirror · Jul 14, 2011 · d99e6a8 · d99e6a8
1 parent 7658e9a
commit d99e6a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4ed95d796e5126bba51466dc07e287cebc8bd19
+refs/heads/master: aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -5729,8 +5729,11 @@ static void rtl_shutdown(struct pci_dev *pdev)
 	spin_unlock_irq(&tp->lock);
 
 	if (system_state == SYSTEM_POWER_OFF) {
-		/* WoL fails with some 8168 when the receiver is disabled. */
-		if (tp->features & RTL_FEATURE_WOL) {
+		/* WoL fails with 8168b when the receiver is disabled. */
+		if ((tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+		     tp->mac_version == RTL_GIGA_MAC_VER_12 ||
+		     tp->mac_version == RTL_GIGA_MAC_VER_17) &&
+		    (tp->features & RTL_FEATURE_WOL)) {
 			pci_clear_master(pdev);
 
 			RTL_W8(ChipCmd, CmdRxEnb);