netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hayes Wang <hayeswang@realtek.com>
To: <romieu@fr.zoreil.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net-next 5/6] r8169: fix wake on lan setting for 8111E
Date: Tue, 5 Jul 2011 17:44:54 +0800	[thread overview]
Message-ID: <1309859095-32031-5-git-send-email-hayeswang@realtek.com> (raw)
In-Reply-To: <1309859095-32031-1-git-send-email-hayeswang@realtek.com>

Only 8111E needs enable RxConfig bit 0 ~ 3 when suspending or
shutdowning when supporting wake on lan.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 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 fa2c139..01da16a 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3266,8 +3266,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;
 	}
 
-- 
1.7.3.2

  parent reply	other threads:[~2011-07-05  9:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-05  9:44 [PATCH net-next 1/6] r8169: adjust some registers Hayes Wang
2011-07-05  9:44 ` [PATCH net-next 2/6] r8169: modify the flow hw reset Hayes Wang
2011-07-05 18:55   ` Francois Romieu
2011-07-06  7:48     ` hayeswang
2011-07-05  9:44 ` [PATCH net-next 3/6] r8169: adjust the settings about RxConfig Hayes Wang
2011-07-05 18:55   ` Francois Romieu
2011-07-05  9:44 ` [PATCH net-next 4/6] r8169: add ERI functions Hayes Wang
2011-07-05 18:55   ` Francois Romieu
2011-07-05  9:44 ` Hayes Wang [this message]
2011-07-05 18:55   ` [PATCH net-next 5/6] r8169: fix wake on lan setting for 8111E Francois Romieu
2011-07-05  9:44 ` [PATCH net-next 6/6] r8169: support RTL8111E-VL Hayes Wang
2011-07-05 18:56   ` Francois Romieu
2011-07-05 18:53 ` [PATCH net-next 1/6] r8169: adjust some registers Francois Romieu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309859095-32031-5-git-send-email-hayeswang@realtek.com \
    --to=hayeswang@realtek.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=romieu@fr.zoreil.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).