From d99e6a8e887123eeb38bed3f082ef1b03f119ca9 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Wed, 6 Jul 2011 15:58:08 +0800 Subject: [PATCH] --- yaml --- r: 256317 b: refs/heads/master c: aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5 h: refs/heads/master i: 256315: c5f818dd23d5793ec49d2b2a2e3db0edb67c0622 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2deb627e2084..c433032baad3 100644 --- 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 index 1d2508834415..6d7f686383fc 100644 --- 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);