From d2bd7493b19f9a1a77ef40de4ac43077d54af8f9 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Tue, 17 Apr 2012 11:10:11 +0200 Subject: [PATCH] --- yaml --- r: 300787 b: refs/heads/master c: 851e60221926a53344b4227879858bef841b0477 h: refs/heads/master i: 300785: 1278c1b6ac5d130cfb8a279509cf1a634ff3ed1c 300783: 451a12c8b8478079e15be80673e82e3f75f85076 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/realtek/r8169.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 660fcee8a45a..412d9752ff57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecffe75f934b4e3c5301fe5db278068e0efb0d6b +refs/heads/master: 851e60221926a53344b4227879858bef841b0477 diff --git a/trunk/drivers/net/ethernet/realtek/r8169.c b/trunk/drivers/net/ethernet/realtek/r8169.c index 71393ea8ef51..9b0b00bbe300 100644 --- a/trunk/drivers/net/ethernet/realtek/r8169.c +++ b/trunk/drivers/net/ethernet/realtek/r8169.c @@ -1396,7 +1396,6 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) u16 reg; u8 mask; } cfg[] = { - { WAKE_ANY, Config1, PMEnable }, { WAKE_PHY, Config3, LinkUp }, { WAKE_MAGIC, Config3, MagicPacket }, { WAKE_UCAST, Config5, UWF }, @@ -1404,16 +1403,28 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) { WAKE_MCAST, Config5, MWF }, { WAKE_ANY, Config5, LanWake } }; + u8 options; RTL_W8(Cfg9346, Cfg9346_Unlock); for (i = 0; i < ARRAY_SIZE(cfg); i++) { - u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask; + options = RTL_R8(cfg[i].reg) & ~cfg[i].mask; if (wolopts & cfg[i].opt) options |= cfg[i].mask; RTL_W8(cfg[i].reg, options); } + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_17: + options = RTL_R8(Config1) & ~PMEnable; + if (wolopts) + options |= PMEnable; + RTL_W8(Config1, options); + break; + default: + break; + } + RTL_W8(Cfg9346, Cfg9346_Lock); }