diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2012-10-06 11:19:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:38:56 +0900 |
| commit | 160f00fefef1e5b72be0745236d2b65d14b99ed4 (patch) | |
| tree | c82b8114a072c8a7014b4d8f7061c46c9be0f348 /drivers/net | |
| parent | 34ffca41fc0a205bb00382be7bbefbf2fc63436d (diff) | |
| download | linux-3.10-160f00fefef1e5b72be0745236d2b65d14b99ed4.tar.gz linux-3.10-160f00fefef1e5b72be0745236d2b65d14b99ed4.tar.bz2 linux-3.10-160f00fefef1e5b72be0745236d2b65d14b99ed4.zip | |
r8169: 8168c and later require bit 0x20 to be set in Config2 for PME signaling.
commit d387b427c973974dd619a33549c070ac5d0e089f upstream.
The new 84xx stopped flying below the radars.
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/ethernet/realtek/r8169.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index adf496d0ce4..482dcd3a7ad 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -319,6 +319,8 @@ enum rtl_registers { Config0 = 0x51, Config1 = 0x52, Config2 = 0x53, +#define PME_SIGNAL (1 << 5) /* 8168c and later */ + Config3 = 0x54, Config4 = 0x55, Config5 = 0x56, @@ -1426,6 +1428,10 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) RTL_W8(Config1, options); break; default: + options = RTL_R8(Config2) & ~PME_SIGNAL; + if (wolopts) + options |= PME_SIGNAL; + RTL_W8(Config2, options); break; } |