From patchwork Sat Aug 17 09:00:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 267968 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 9F5342C0208 for ; Sat, 17 Aug 2013 19:00:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314Ab3HQJAJ (ORCPT ); Sat, 17 Aug 2013 05:00:09 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:36552 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177Ab3HQJAI (ORCPT ); Sat, 17 Aug 2013 05:00:08 -0400 Received: by mail-ee0-f54.google.com with SMTP id e53so1271781eek.41 for ; Sat, 17 Aug 2013 02:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Jb16+ZrVeD8mCutpQKaJOYNP7cbzELpRA2x/R0vUVdI=; b=VBbGS9FMY8g82wANwSj75gWheTBsj6SP6pj18nIoke7u5gk1ZSzZgn9yC8uoPQfUPs /x46gb0VKpCKbmoIbT43CeC8bHM6Pt5JZtiwOzSRT8w4wnH0EmduDW8+8RgaH0pv+Ned UbXMrkb/FIRJj6rjMLw+hxm/joQseXvnJsIGbT+/qSF8mUq6LexR14jXeEppEPpjtxJ/ kxaFgaAf1qrrjtWkzh+xOh3MiLdeVtqlITXy9MISiJ44MfIitheHGp/G6bkRFqQTu6o4 Z5dpumQ0L2DuNaOWFRTUl34X0OUuWy5JpBX5z+fEWsI1xvYQxRV4rf3d6WelGo42rwIh LsBQ== X-Received: by 10.14.198.73 with SMTP id u49mr3917842een.13.1376730007067; Sat, 17 Aug 2013 02:00:07 -0700 (PDT) Received: from localhost.localdomain (ip4da018ae.direct-adsl.nl. [77.160.24.174]) by mx.google.com with ESMTPSA id k3sm2244659een.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 17 Aug 2013 02:00:06 -0700 (PDT) From: Peter Wu To: netdev@vger.kernel.org Cc: nic_swsd , Hayes Wang , Francois Romieu , lekensteyn@gmail.com Subject: [PATCH] r8169: remember WOL preferences on driver load Date: Sat, 17 Aug 2013 11:00:02 +0200 Message-Id: <1376730002-9235-1-git-send-email-lekensteyn@gmail.com> X-Mailer: git-send-email 1.8.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Peter Wu Do not clear Broadcast/Multicast/Unicast Wake Flag or LanWake in Config5. This is necessary to preserve WOL state when the driver is loaded. Although the r8168 vendor driver does not write Config5 (it has been commented out), Hayes Wang from Realtek said that masking bits like this is more sensible. Signed-off-by: Peter Wu Acked-by: Francois Romieu --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2943916..104eaef 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7092,7 +7092,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) RTL_W8(Cfg9346, Cfg9346_Unlock); RTL_W8(Config1, RTL_R8(Config1) | PMEnable); - RTL_W8(Config5, RTL_R8(Config5) & PMEStatus); + RTL_W8(Config5, RTL_R8(Config5) & (BWF | MWF | UWF | LanWake | PMEStatus)); if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) tp->features |= RTL_FEATURE_WOL; if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0)