diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-21 15:59:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-22 02:21:43 +0200 |
| commit | 5f8629c526b4f7e529a6d27bbd802c0dc7fcc357 (patch) | |
| tree | cab14d913c195769820bfe3a9fe08325e67cf96b | |
| parent | tg3: Add additional EEE messaging (diff) | |
| download | linux-5f8629c526b4f7e529a6d27bbd802c0dc7fcc357.tar.xz linux-5f8629c526b4f7e529a6d27bbd802c0dc7fcc357.zip | |
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>
| -rw-r--r-- | net/core/ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 13d79f5a86e5..d8b1a8d85a96 100644 --- 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); |