| From stable-owner@vger.kernel.org Sat Oct 6 06:49:16 2012 |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| Date: Fri, 5 Oct 2012 23:29:08 +0200 |
| Subject: r8169: fix wake on lan setting for non-8111E. |
| To: stable@vger.kernel.org |
| |
| From: Hayes Wang <hayeswang@realtek.com> |
| |
| 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> |
| --- |
| drivers/net/r8169.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/r8169.c |
| +++ b/drivers/net/r8169.c |
| @@ -3126,8 +3126,10 @@ static void r8168_pll_power_down(struct |
| 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; |
| } |
| |
