net: fix hw_features ethtool_ops->set_flags compatibility

__ethtool_set_flags() was not taking into account features set but not
user-toggleable.

Since GFLAGS returns masked dev->features, EINVAL is returned when
passed flags differ to it, and not to wanted_features.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 13d79f5a86e56cd3812ebbc655fe0244cb646030..d8b1a8d85a9663b2d3c68f8543841e57cf651427 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -546,12 +546,12 @@ int __ethtool_set_flags(struct net_device *dev, u32 data)
        }
 
        /* allow changing only bits set in hw_features */
-       changed = (data ^ dev->wanted_features) & flags_dup_features;
+       changed = (data ^ dev->features) & flags_dup_features;
        if (changed & ~dev->hw_features)
                return (changed & dev->hw_features) ? -EINVAL : -EOPNOTSUPP;
 
        dev->wanted_features =
-               (dev->wanted_features & ~changed) | data;
+               (dev->wanted_features & ~changed) | (data & dev->hw_features);
 
        __netdev_update_features(dev);