net: fix __netdev_update_features return on ndo_set_features failure

Nikolay Aleksandrov · davem330 · commit 00ee59271777 · 2015-11-16T14:56:03.000-05:00
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: 6cb6a27 ("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>
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -6433,7 +6433,7 @@ int __netdev_update_features(struct net_device *dev)`
`6433`	`6433`	`netdev_err(dev,`
`6434`	`6434`	`"set_features() failed (%d); wanted %pNF, left %pNF\n",`
`6435`	`6435`	`err, &features, &dev->features);`
`6436`		`- return -1;`
	`6436`	`+ return 0;`
`6437`	`6437`	`}`
`6438`	`6438`
`6439`	`6439`	`sync_lower:`