Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f8629c5 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47007831

net/core/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -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);