summaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorHayes Wang <hayeswang@realtek.com>2011-07-06 09:58:08 +0200
committerFrancois Romieu <romieu@fr.zoreil.com>2011-07-14 23:22:53 +0200
commitaaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5 (patch)
treee0a19f6faec27d0fdb9634cd419f38e2f125deca /drivers/net/r8169.c
parentr8169: fix wake on lan setting for non-8111E. (diff)
downloadlinux-aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5.tar.xz
linux-aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5.zip
r8169: don't enable rx when shutdown.
Only 8111b needs to enable rx when shutdowning with WoL. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 1d2508834415..6d7f686383fc 100644
--- a/drivers/net/r8169.c
+++ b/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);