From patchwork Wed Jul 6 07:58:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hayes Wang X-Patchwork-Id: 103435 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 49B5FB6F7A for ; Wed, 6 Jul 2011 18:00:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753321Ab1GFIAG (ORCPT ); Wed, 6 Jul 2011 04:00:06 -0400 Received: from rtits2.realtek.com ([60.250.210.242]:45961 "EHLO rtits2.realtek.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751591Ab1GFH6u (ORCPT ); Wed, 6 Jul 2011 03:58:50 -0400 X-SpamFilter-By: BOX Solutions SpamTrap 5.11 with qID p667wiYf003443 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 p667wiYf003443; Wed, 6 Jul 2011 15:58:46 +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 7/7] r8169: don't enable rx when shutdown Date: Wed, 6 Jul 2011 15:58:08 +0800 X-BOX-Message-Id: p667wiYf003443 Message-ID: <1309939088-31994-7-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 8111b needs to enable rx when shutdown for supporting WOL. Signed-off-by: Hayes Wang --- drivers/net/r8169.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 8551848..99a2f30 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -5760,8 +5760,11 @@ static void rtl_shutdown(struct pci_dev *pdev) spin_unlock_irq(&tp->lock); if (system_state == SYSTEM_POWER_OFF) { - /* WoL fails with some 8168 when the receiver is disabled. */ - if (tp->features & RTL_FEATURE_WOL) { + /* WoL fails with 8168b when the receiver is disabled. */ + if ((tp->mac_version == RTL_GIGA_MAC_VER_11 || + tp->mac_version == RTL_GIGA_MAC_VER_12 || + tp->mac_version == RTL_GIGA_MAC_VER_17) && + (tp->features & RTL_FEATURE_WOL)) { pci_clear_master(pdev); RTL_W8(ChipCmd, CmdRxEnb);