From: Nikolay Aleksandrov <niko...@cumulusnetworks.com> 3.4.113-rc1 review patch. If anyone has any objections, please let me know.
------------------ commit 00ee5927177792a6e139d50b6b7564d35705556a upstream. 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: 6cb6a27c45ce ("net: Call netdev_features_change() from netdev_update_features()") CC: Michał Mirosław <mirq-li...@rere.qmqm.pl> Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com> Signed-off-by: David S. Miller <da...@davemloft.net> Signed-off-by: Zefan Li <lize...@huawei.com> --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 4f679bf..1f57ab1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5368,7 +5368,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; } if (!err) -- 1.9.1