diff options
author | hayeswang <hayeswang@realtek.com> | 2016-07-06 05:35:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-08 23:47:28 -0400 |
commit | 92f7d07d68c1dfcbb80b3259f29dad8efe890803 (patch) | |
tree | f75fedffcf7ad2da2599e1ed85dc9d6664e0075e /drivers/net/usb | |
parent | 205e1e255c479f3fd77446415706463b282f94e4 (diff) |
r8152: remove the setting of LAN_WAKE_EN
The LAN_WAKE_EN is not used to determine if the device could support
WOL. It is used to signal a GPIO pin when a WOL event occurs. The WOL
still works even though it is disabled.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/r8152.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0da72d39b4f9..419f4cee432b 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
@@ -2296,10 +2296,6 @@ static u32 __rtl_get_wol(struct r8152 *tp) | |||
2296 | u32 ocp_data; | 2296 | u32 ocp_data; |
2297 | u32 wolopts = 0; | 2297 | u32 wolopts = 0; |
2298 | 2298 | ||
2299 | ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5); | ||
2300 | if (!(ocp_data & LAN_WAKE_EN)) | ||
2301 | return 0; | ||
2302 | |||
2303 | ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); | 2299 | ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); |
2304 | if (ocp_data & LINK_ON_WAKE_EN) | 2300 | if (ocp_data & LINK_ON_WAKE_EN) |
2305 | wolopts |= WAKE_PHY; | 2301 | wolopts |= WAKE_PHY; |
@@ -2332,15 +2328,13 @@ static void __rtl_set_wol(struct r8152 *tp, u32 wolopts) | |||
2332 | ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); | 2328 | ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); |
2333 | 2329 | ||
2334 | ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5); | 2330 | ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5); |
2335 | ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN | LAN_WAKE_EN); | 2331 | ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN); |
2336 | if (wolopts & WAKE_UCAST) | 2332 | if (wolopts & WAKE_UCAST) |
2337 | ocp_data |= UWF_EN; | 2333 | ocp_data |= UWF_EN; |
2338 | if (wolopts & WAKE_BCAST) | 2334 | if (wolopts & WAKE_BCAST) |
2339 | ocp_data |= BWF_EN; | 2335 | ocp_data |= BWF_EN; |
2340 | if (wolopts & WAKE_MCAST) | 2336 | if (wolopts & WAKE_MCAST) |
2341 | ocp_data |= MWF_EN; | 2337 | ocp_data |= MWF_EN; |
2342 | if (wolopts & WAKE_ANY) | ||
2343 | ocp_data |= LAN_WAKE_EN; | ||
2344 | ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data); | 2338 | ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data); |
2345 | 2339 | ||
2346 | ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); | 2340 | ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); |