From: Hayes Wang Date: Wed, 6 Jul 2011 07:58:07 +0000 (+0800) Subject: r8169: fix wake on lan setting for non-8111E. X-Git-Tag: MMI-PSA29.97-13-9~18929^2~132^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4ed95d796e5126bba51466dc07e287cebc8bd19;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git r8169: fix wake on lan setting for non-8111E. 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 --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index ecfaf5634f53..1d2508834415 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3393,8 +3393,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; }