From: Hayes Wang Date: Fri, 5 Oct 2012 21:29:08 +0000 (+0200) Subject: r8169: fix wake on lan setting for non-8111E. X-Git-Tag: v3.0.46~25 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39ee3305297e471046d932b088190e54e1552fda;p=karo-tx-linux.git 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 Acked-by: Francois Romieu Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 5f838ef92494..0d2387aaf6ac 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; }