summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-09-28 16:18:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-04 14:52:40 +0100
commit9eaabc0a77799b3563a5be757e551ae7463d2706 (patch)
treeecfbf874751b0f39d08b34921637855d97df1819 /drivers
parent4301fb3391eddf9c697bac653320749735d5a2a9 (diff)
downloadlinux-stable-9eaabc0a77799b3563a5be757e551ae7463d2706.tar.gz
linux-stable-9eaabc0a77799b3563a5be757e551ae7463d2706.tar.bz2
linux-stable-9eaabc0a77799b3563a5be757e551ae7463d2706.zip
r8152: Check for supported Wake-on-LAN Modes
[ Upstream commit f2750df1548bd8a2b060eb609fc43ca82811af4c ] The driver does not check for Wake-on-LAN modes specified by an user, but will conditionally set the device as wake-up enabled or not based on that, which could be a very confusing user experience. Fixes: 21ff2e8976b1 ("r8152: support WOL") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/r8152.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 0fa64cc1a011..66beff4d7646 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4497,6 +4497,9 @@ static int rtl8152_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
if (!rtl_can_wakeup(tp))
return -EOPNOTSUPP;
+ if (wol->wolopts & ~WAKE_ANY)
+ return -EINVAL;
+
ret = usb_autopm_get_interface(tp->intf);
if (ret < 0)
goto out_set_wol;