From: Hayes Wang Date: Wed, 6 Jul 2011 07:58:08 +0000 (+0800) Subject: r8169: don't enable rx when shutdown. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5;p=~shefty%2Frdma-dev.git r8169: don't enable rx when shutdown. Only 8111b needs to enable rx when shutdowning with WoL. Signed-off-by: Hayes Wang Acked-by: Francois Romieu --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 1d250883441..6d7f686383f 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);