From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Young Subject: Re: [net] net: fix feature changes on devices without ndo_set_features Date: Sun, 15 Nov 2015 15:25:44 +0800 Message-ID: <20151115072544.GA18705@dhcp-128-65.nay.redhat.com> References: <1447422841-2333-1-git-send-email-razor@blackwall.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, davem@davemloft.net, Nikolay Aleksandrov , Jarod Wilson , Jiri Pirko , Ido Schimmel , Sander Eikelenboom , Andy Gospodarek , Florian Fainelli To: Nikolay Aleksandrov Return-path: Received: from mx1.redhat.com ([209.132.183.28]:51103 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751243AbbKOHZz (ORCPT ); Sun, 15 Nov 2015 02:25:55 -0500 Content-Disposition: inline In-Reply-To: <1447422841-2333-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org List-ID: On 11/13/15 at 02:54pm, 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 > Reviewed-by: Jiri Pirko > Reviewed-by: Andy Gospodarek > Reviewed-by: Jarod Wilson > Tested-by: Florian Fainelli > --- > 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, Tested-by: Dave Young Thanks Dave