lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 36/61] lan78xx: Check for supported Wake-on-LAN modes
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit eb9ad088f96653a26b340f7c447c44cf023d5cdc ]

    The driver supports a fair amount of Wake-on-LAN modes, but is not
    checking that the user specified one that is supported.

    Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Reviewed-by: Woojung Huh <Woojung.Huh@Microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/usb/lan78xx.c | 17 ++++-------------
    1 file changed, 4 insertions(+), 13 deletions(-)

    diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
    index 9e3f632e22f1..00ddcaf09014 100644
    --- a/drivers/net/usb/lan78xx.c
    +++ b/drivers/net/usb/lan78xx.c
    @@ -1375,19 +1375,10 @@ static int lan78xx_set_wol(struct net_device *netdev,
    if (ret < 0)
    return ret;

    - pdata->wol = 0;
    - if (wol->wolopts & WAKE_UCAST)
    - pdata->wol |= WAKE_UCAST;
    - if (wol->wolopts & WAKE_MCAST)
    - pdata->wol |= WAKE_MCAST;
    - if (wol->wolopts & WAKE_BCAST)
    - pdata->wol |= WAKE_BCAST;
    - if (wol->wolopts & WAKE_MAGIC)
    - pdata->wol |= WAKE_MAGIC;
    - if (wol->wolopts & WAKE_PHY)
    - pdata->wol |= WAKE_PHY;
    - if (wol->wolopts & WAKE_ARP)
    - pdata->wol |= WAKE_ARP;
    + if (wol->wolopts & ~WAKE_ALL)
    + return -EINVAL;
    +
    + pdata->wol = wol->wolopts;

    device_set_wakeup_enable(&dev->udev->dev, (bool)wol->wolopts);

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:26    [W:4.112 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site