diff options
| author | Hayes Wang <hayeswang@realtek.com> | 2012-10-05 23:29:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:12 +0900 |
| commit | 39ee3305297e471046d932b088190e54e1552fda (patch) | |
| tree | ea9145762b393a78d77304ecc273c17518671d04 /drivers/net/r8169.c | |
| parent | 3f6ea7b4b5adbb6ee9271d48dd63dd98645e505b (diff) | |
| download | kernel_samsung_smdk4412-39ee3305297e471046d932b088190e54e1552fda.zip kernel_samsung_smdk4412-39ee3305297e471046d932b088190e54e1552fda.tar.gz kernel_samsung_smdk4412-39ee3305297e471046d932b088190e54e1552fda.tar.bz2 | |
r8169: fix wake on lan setting for non-8111E.
commit d4ed95d796e5126bba51466dc07e287cebc8bd19 upstream.
Only 8111E needs enable RxConfig bit 0 ~ 3 when suspending or
shutdowning for wake on lan.
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/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 5f838ef..0d2387a 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3126,8 +3126,10 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, MII_BMCR, 0x0000); - RTL_W32(RxConfig, RTL_R32(RxConfig) | - AcceptBroadcast | AcceptMulticast | AcceptMyPhys); + if (tp->mac_version == RTL_GIGA_MAC_VER_32 || + tp->mac_version == RTL_GIGA_MAC_VER_33) + RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast | + AcceptMulticast | AcceptMyPhys); return; } |