net: fix __netdev_update_features return on ndo_set_features failure
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fri, 13 Nov 2015 14:20:24 +0000 (15:20 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 Dec 2015 02:25:55 +0000 (02:25 +0000)
commitbb62cdf556744e4e98b2c51abf10c3a108b4c373
tree7b386a03a933e58372ee79409a14e8bba36de450
parentba5021857b8651840d1830838db208ddfeed98ca
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 <mirq-linux@rere.qmqm.pl>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/core/dev.c