From: Nikolay Aleksandrov Date: Fri, 13 Nov 2015 14:20:24 +0000 (+0100) Subject: net: fix __netdev_update_features return on ndo_set_features failure X-Git-Tag: v3.4.113~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73cb24083e4068c8a7b7de4820e4906f78651b8;p=thirdparty%2Fkernel%2Fstable.git net: fix __netdev_update_features return on ndo_set_features failure 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 Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Zefan Li --- diff --git a/net/core/dev.c b/net/core/dev.c index 4f679bf4f12e0..1f57ab1c6adf4 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)