diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2012-10-05 23:29:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:13 +0900 |
| commit | 68c93387c8081fcb359a3d2d37f3504e03be0e5b (patch) | |
| tree | 1afea7ae9146518e6d467e7c65874203526b4175 /drivers/net | |
| parent | f6e16b72069fc70195174a86e73c04c8dd4cca3b (diff) | |
| download | kernel_samsung_smdk4412-68c93387c8081fcb359a3d2d37f3504e03be0e5b.zip kernel_samsung_smdk4412-68c93387c8081fcb359a3d2d37f3504e03be0e5b.tar.gz kernel_samsung_smdk4412-68c93387c8081fcb359a3d2d37f3504e03be0e5b.tar.bz2 | |
r8169: Config1 is read-only on 8168c and later.
commit 851e60221926a53344b4227879858bef841b0477 upstream.
Suggested by Hayes.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/r8169.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a686479..c9bf1e8 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1223,7 +1223,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 }, @@ -1231,16 +1230,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); } |