Commit 00ee5927 authored Nov 13, 2015 by Nikolay Aleksandrov Committed by David S. Miller Nov 16, 2015

net: fix __netdev_update_features return on ndo_set_features failure

If ndo_set_features fails __netdev_update_features() will return -1 but
this is wrong because it is expected to return 0 if no features were
changed (see netdev_update_features()), which will cause a netdev
notifier to be called without any actual changes. Fix this by returning
0 if ndo_set_features fails.

Fixes: 6cb6a27c ("net: Call netdev_features_change() from netdev_update_features()")
CC: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5f8dc33e

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6433,7 +6433,7 @@ int __netdev_update_features(struct net_device *dev)
		netdev_err(dev,
		"set_features() failed (%d); wanted %pNF, left %pNF\n",
		err, &features, &dev->features);
		return -1;
		return 0;
		}

		sync_lower:

Admin message