From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH net] net: fix feature changes on devices without ndo_set_features Date: Wed, 18 Nov 2015 02:03:08 +0300 Message-ID: <564BB22C.2000606@cogentembedded.com> References: <5645C0A5.2080506@cumulusnetworks.com> <1447422841-2333-1-git-send-email-razor@blackwall.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, Nikolay Aleksandrov , Jarod Wilson , Jiri Pirko , Ido Schimmel , Sander Eikelenboom , Andy Gospodarek , Florian Fainelli To: Nikolay Aleksandrov , netdev@vger.kernel.org Return-path: Received: from mail-lb0-f182.google.com ([209.85.217.182]:32895 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbbKQXDM (ORCPT ); Tue, 17 Nov 2015 18:03:12 -0500 Received: by lbbkw15 with SMTP id kw15so14708219lbb.0 for ; Tue, 17 Nov 2015 15:03:11 -0800 (PST) In-Reply-To: <1447422841-2333-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org List-ID: Hello. On 11/13/2015 04:54 PM, Nikolay Aleksandrov wrote: > From: Nikolay Aleksandrov > > 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 > CC: Jiri Pirko > CC: Ido Schimmel > CC: Sander Eikelenboom > CC: Andy Gospodarek > CC: Florian Fainelli > Signed-off-by: Nikolay Aleksandrov > --- > 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; This makes the 'err' initializer pointless. MBR, Sergei