diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-09-24 21:58:59 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-26 20:04:11 -0700 |
| commit | 6194114324139dc16f3251c67ed853bd6d4ae056 (patch) | |
| tree | 5bf8ef329dbde8f6edfb6c370b4ae73baed015e9 /net/core | |
| parent | Revert "net: phy: fix WoL handling when suspending the PHY" (diff) | |
| download | linux-dev-6194114324139dc16f3251c67ed853bd6d4ae056.tar.xz linux-dev-6194114324139dc16f3251c67ed853bd6d4ae056.zip | |
net: core: add member wol_enabled to struct net_device
Add flag wol_enabled to struct net_device indicating whether
Wake-on-LAN is enabled. As first user phy_suspend() will use it to
decide whether PHY can be suspended or not.
Fixes: f1e911d5d0df ("r8169: add basic phylib support")
Fixes: e8cfd9d6c772 ("net: phy: call state machine synchronously in phy_stop")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/ethtool.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 234a0ec2e932..0762aaf8e964 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1483,6 +1483,7 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) static int ethtool_set_wol(struct net_device *dev, char __user *useraddr) { struct ethtool_wolinfo wol; + int ret; if (!dev->ethtool_ops->set_wol) return -EOPNOTSUPP; @@ -1490,7 +1491,13 @@ static int ethtool_set_wol(struct net_device *dev, char __user *useraddr) if (copy_from_user(&wol, useraddr, sizeof(wol))) return -EFAULT; - return dev->ethtool_ops->set_wol(dev, &wol); + ret = dev->ethtool_ops->set_wol(dev, &wol); + if (ret) + return ret; + + dev->wol_enabled = !!wol.wolopts; + + return 0; } static int ethtool_get_eee(struct net_device *dev, char __user *useraddr) |