r8169: reject unsupported WoL options

So far unsupported WoL options are silently ignored. Change this and
reject attempts to set unsupported options. This prevents situations
where a user tries to set an unsupported WoL option and is under the
impression it was successful because ethtool doesn't complain.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1d33672c650df017a064c13d4c15239e38fbc34f..70c13cc282d0e2e0415165c7c09ab763a2c0cb90 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1712,11 +1712,14 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
        struct rtl8169_private *tp = netdev_priv(dev);
        struct device *d = tp_to_dev(tp);
 
+       if (wol->wolopts & ~WAKE_ANY)
+               return -EINVAL;
+
        pm_runtime_get_noresume(d);
 
        rtl_lock_work(tp);
 
-       tp->saved_wolopts = wol->wolopts & WAKE_ANY;
+       tp->saved_wolopts = wol->wolopts;
 
        if (pm_runtime_active(d))
                __rtl8169_set_wol(tp, tp->saved_wolopts);