diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-11-13 15:20:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-16 14:56:03 -0500 |
| commit | 00ee5927177792a6e139d50b6b7564d35705556a (patch) | |
| tree | 51d79c6a16b5ad9280d1bca48db4cc91d0ecbec2 /net | |
| parent | 5f8dc33e8ee7e59bee3bc6dc2088807a384b285a (diff) | |
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: 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4a1d198dbbff..1974aee005a6 100644 --- 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: |