From patchwork Wed Jul 6 07:58:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hayes Wang X-Patchwork-Id: 103430 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 02205B6F74 for ; Wed, 6 Jul 2011 17:59:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247Ab1GFH6x (ORCPT ); Wed, 6 Jul 2011 03:58:53 -0400 Received: from rtits2.realtek.com ([60.250.210.242]:45959 "EHLO rtits2.realtek.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345Ab1GFH6t (ORCPT ); Wed, 6 Jul 2011 03:58:49 -0400 X-SpamFilter-By: BOX Solutions SpamTrap 5.11 with qID p667wiYe003443 Received: from mail.realtek.com.tw (rtitcas1.realtek.com.tw[172.21.1.180]) by rtits2.realtek.com (8.14.4/2.06/5.19) with ESMTP id p667wiYe003443; Wed, 6 Jul 2011 15:58:45 +0800 Received: from fc14.localdomain (172.21.71.143) by RTITCAS1.realtek.com.tw (172.21.1.180) with Microsoft SMTP Server id 8.3.159.2; Wed, 6 Jul 2011 15:58:45 +0800 From: Hayes Wang To: CC: , , Hayes Wang Subject: [PATCH net-next v2 6/7] r8169: fix wake on lan setting for non-8111E Date: Wed, 6 Jul 2011 15:58:07 +0800 X-BOX-Message-Id: p667wiYe003443 Message-ID: <1309939088-31994-6-git-send-email-hayeswang@realtek.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1309939088-31994-1-git-send-email-hayeswang@realtek.com> References: <1309939088-31994-1-git-send-email-hayeswang@realtek.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Only 8111E needs enable RxConfig bit 0 ~ 3 when suspending or shutdowning when supporting wake on lan. Signed-off-by: Hayes Wang --- 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 6bfabe2..8551848 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3390,8 +3390,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; }