From 7658e9ad47cc83b89bb1cc010c3c323d91618a2f Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Wed, 6 Jul 2011 15:58:07 +0800 Subject: [PATCH] --- yaml --- r: 256316 b: refs/heads/master c: d4ed95d796e5126bba51466dc07e287cebc8bd19 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb92a460653c..2deb627e2084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70090424e59652c4b2e777b533cc23134b176b83 +refs/heads/master: d4ed95d796e5126bba51466dc07e287cebc8bd19 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index ecfaf5634f53..1d2508834415 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -3393,8 +3393,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; }