[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1447422841-2333-1-git-send-email-razor@blackwall.org>
Date: Fri, 13 Nov 2015 14:54:01 +0100
From: Nikolay Aleksandrov <razor@...ckwall.org>
To: netdev@...r.kernel.org
Cc: davem@...emloft.net,
Nikolay Aleksandrov <nikolay@...ulusnetworks.com>,
Jarod Wilson <jarod@...hat.com>, Jiri Pirko <jiri@...nulli.us>,
Ido Schimmel <idosch@...lanox.com>,
Sander Eikelenboom <linux@...elenboom.it>,
Andy Gospodarek <gospo@...ulusnetworks.com>,
Florian Fainelli <f.fainelli@...il.com>
Subject: [PATCH net] net: fix feature changes on devices without ndo_set_features
From: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
When __netdev_update_features() was updated to ensure some features are
disabled on new lower devices, an error was introduced for devices which
don't have the ndo_set_features() method set. Before we'll just set the
new features, but now we return an error and don't set them. Fix this by
returning the old behaviour and setting err to 0 when ndo_set_features
is not present.
Fixes: e7868a85e1b2 ("net/core: ensure features get disabled on new lower devs")
CC: Jarod Wilson <jarod@...hat.com>
CC: Jiri Pirko <jiri@...nulli.us>
CC: Ido Schimmel <idosch@...lanox.com>
CC: Sander Eikelenboom <linux@...elenboom.it>
CC: Andy Gospodarek <gospo@...ulusnetworks.com>
CC: Florian Fainelli <f.fainelli@...il.com>
Signed-off-by: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
---
Sander please feel free to give your Tested-by.
net/core/dev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index ab9b8d0d115e..4a1d198dbbff 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6426,6 +6426,8 @@ int __netdev_update_features(struct net_device *dev)
if (dev->netdev_ops->ndo_set_features)
err = dev->netdev_ops->ndo_set_features(dev, features);
+ else
+ err = 0;
if (unlikely(err < 0)) {
netdev_err(dev,
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists