diff options
| author | Hayes Wang <hayeswang@realtek.com> | 2012-10-05 23:29:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:12 +0900 |
| commit | 567660504db3899c076acdd7e466b6c1d6d46592 (patch) | |
| tree | a1b57da7db72a1596683b99780ab3c7e080fde61 /drivers | |
| parent | 39ee3305297e471046d932b088190e54e1552fda (diff) | |
| download | kernel_samsung_smdk4412-567660504db3899c076acdd7e466b6c1d6d46592.zip kernel_samsung_smdk4412-567660504db3899c076acdd7e466b6c1d6d46592.tar.gz kernel_samsung_smdk4412-567660504db3899c076acdd7e466b6c1d6d46592.tar.bz2 | |
r8169: don't enable rx when shutdown.
commit aaa89c08d9ffa3739c93d65d98b73ec2aa2e93a5 upstream.
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>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r8169.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 0d2387a..fa63283 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -5391,8 +5391,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); |