From patchwork Wed Aug 31 04:09:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ziyang Xuan (William)" X-Patchwork-Id: 12960308 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E08ECAAD8 for ; Wed, 31 Aug 2022 04:10:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231371AbiHaEKR (ORCPT ); Wed, 31 Aug 2022 00:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbiHaEKP (ORCPT ); Wed, 31 Aug 2022 00:10:15 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48B4842ACB; Tue, 30 Aug 2022 21:10:12 -0700 (PDT) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MHVwb4Lnpz1N7hq; Wed, 31 Aug 2022 12:06:23 +0800 (CST) Received: from ubuntu-82.huawei.com (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 31 Aug 2022 12:10:02 +0800 From: Ziyang Xuan To: , , , , , CC: Subject: [PATCH next-next 1/2] net: vlan: remove unnecessary err variable in vlan_init_net() Date: Wed, 31 Aug 2022 12:09:56 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Return vlan_init_net() directly in vlan_init_net(), remove unnecessary err variable. Thus code looks more concise. Signed-off-by: Ziyang Xuan --- net/8021q/vlan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index e40aa3e3641c..aaef80fdd852 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -658,13 +658,10 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) static int __net_init vlan_init_net(struct net *net) { struct vlan_net *vn = net_generic(net, vlan_net_id); - int err; vn->name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD; - err = vlan_proc_init(net); - - return err; + return vlan_proc_init(net); } static void __net_exit vlan_exit_net(struct net *net) From patchwork Wed Aug 31 04:09:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ziyang Xuan (William)" X-Patchwork-Id: 12960307 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE820ECAAD3 for ; Wed, 31 Aug 2022 04:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231224AbiHaEKM (ORCPT ); Wed, 31 Aug 2022 00:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiHaEKK (ORCPT ); Wed, 31 Aug 2022 00:10:10 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 937AA28E24; Tue, 30 Aug 2022 21:10:04 -0700 (PDT) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MHVwt4c5nzlWZk; Wed, 31 Aug 2022 12:06:38 +0800 (CST) Received: from ubuntu-82.huawei.com (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 31 Aug 2022 12:10:02 +0800 From: Ziyang Xuan To: , , , , , CC: Subject: [PATCH next-next 2/2] net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu() Date: Wed, 31 Aug 2022 12:09:57 +0800 Message-ID: <917c41381e1155eefe84c610585c487d8073166f.1661916732.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org If vlan_info is NULL in __vlan_find_dev_deep_rcu(), else { ... } is unnecessary. Remove it to reduce indentation level. Signed-off-by: Ziyang Xuan --- net/8021q/vlan_core.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 5aa8144101dc..027d4ebed9c0 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -77,23 +77,19 @@ struct net_device *__vlan_find_dev_deep_rcu(struct net_device *dev, __be16 vlan_proto, u16 vlan_id) { struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info); + struct net_device *upper_dev; - if (vlan_info) { + if (vlan_info) return vlan_group_get_device(&vlan_info->grp, vlan_proto, vlan_id); - } else { - /* - * Lower devices of master uppers (bonding, team) do not have - * grp assigned to themselves. Grp is assigned to upper device - * instead. - */ - struct net_device *upper_dev; - upper_dev = netdev_master_upper_dev_get_rcu(dev); - if (upper_dev) - return __vlan_find_dev_deep_rcu(upper_dev, - vlan_proto, vlan_id); - } + /* Lower devices of master uppers (bonding, team) do not have + * grp assigned to themselves. Grp is assigned to upper device + * instead. + */ + upper_dev = netdev_master_upper_dev_get_rcu(dev); + if (upper_dev) + return __vlan_find_dev_deep_rcu(upper_dev, vlan_proto, vlan_id); return NULL; }