diff options
| author | Nikolay Aleksandrov <[email protected]> | 2015-11-13 14:54:01 +0100 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-11-16 14:56:03 -0500 |
| commit | 5f8dc33e8ee7e59bee3bc6dc2088807a384b285a (patch) | |
| tree | 9852b51304efc0a52a71579bc47c2d4039c6fe26 | |
| parent | bbe14f54297467ddb23b7d1db564a2468c6ae151 (diff) | |
net: fix feature changes on devices without ndo_set_features
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 <[email protected]>
CC: Jiri Pirko <[email protected]>
CC: Ido Schimmel <[email protected]>
CC: Sander Eikelenboom <[email protected]>
CC: Andy Gospodarek <[email protected]>
CC: Florian Fainelli <[email protected]>
Signed-off-by: Nikolay Aleksandrov <[email protected]>
Reviewed-by: Jiri Pirko <[email protected]>
Reviewed-by: Andy Gospodarek <[email protected]>
Reviewed-by: Jarod Wilson <[email protected]>
Tested-by: Florian Fainelli <[email protected]>
Tested-by: Dave Young <[email protected]>
Tested-by: Christian Borntraeger <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
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, |