| From 17b85d29e82cc3c874a497a8bc5764d6a2b043e2 Mon Sep 17 00:00:00 2001 |
| From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> |
| Date: Tue, 17 Nov 2015 15:49:06 +0100 |
| Subject: net/core: revert "net: fix __netdev_update_features return.." and add |
| comment |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 17b85d29e82cc3c874a497a8bc5764d6a2b043e2 upstream. |
| |
| This reverts commit 00ee59271777 ("net: fix __netdev_update_features return |
| on ndo_set_features failure") |
| and adds a comment explaining why it's okay to return a value other than |
| 0 upon error. Some drivers might actually change flags and return an |
| error so it's better to fire a spurious notification rather than miss |
| these. |
| |
| 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> |
| Signed-off-by: Zefan Li <lizefan@huawei.com> |
| --- |
| net/core/dev.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -5368,7 +5368,10 @@ int __netdev_update_features(struct net_ |
| netdev_err(dev, |
| "set_features() failed (%d); wanted %pNF, left %pNF\n", |
| err, &features, &dev->features); |
| - return 0; |
| + /* return non-0 since some features might have changed and |
| + * it's better to fire a spurious notification than miss it |
| + */ |
| + return -1; |
| } |
| |
| if (!err) |
