From patchwork Wed Mar 23 10:55:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12789674 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 D7AF4C433F5 for ; Wed, 23 Mar 2022 10:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243635AbiCWK6s (ORCPT ); Wed, 23 Mar 2022 06:58:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236170AbiCWK6p (ORCPT ); Wed, 23 Mar 2022 06:58:45 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FFD05F8CD for ; Wed, 23 Mar 2022 03:57:16 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id z128so813323pgz.2 for ; Wed, 23 Mar 2022 03:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=cbE4kL7VCryp+0XBxWUBmI8bbdZbrOSKHdwl74h8AIc=; b=HBIRcCjOqea65d6IBWbNaHkSiDDQ57Xwj6Q7jtoirHe4XMNagiCahtcfwMYpUu0VfU QqbMPm/teFg0paVjGBBEFut6phDLlPTZ+o2O6j1Rm5JZkwkvB5ZOtPFkfAiDrRRGb53t Gq+qtaXZu7b+C5b+Hh9HjaAwaX57CJrfjKpj0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=cbE4kL7VCryp+0XBxWUBmI8bbdZbrOSKHdwl74h8AIc=; b=LnUPs4te8dJlgXJPptLwp/TDa0hMwQWdcUt7LUNdLiIHucZrkC80XtIcwIFldt0mfG qwwYzPQ6/b6v+nrGCb2aCdM39xU8QZYahOtB1v/7FGV8ERyD+nuTtdJ9XkIHYxeUsekl 5Sqgds+rebmbPflVvTX7FPEyK/twv3t/igisRqeUS0Hijx2QUGJIwB+l6AyK+Dlxkr20 Hkgqr7ypsDLKd6svt75lOujgWn00szl14EIlLtpUfpp6S7qKKSVGHVIDypKyWkYDXBG4 iMPqtuNlSKyf4FGJMNIC19HFmt8vpaUlqMDdX75z0v+fTdVdPg7TUdBNKKcnq6NhzBOM SaHg== X-Gm-Message-State: AOAM530GkYzHi5sWTURya85IIf5gkIRdVovxcwrPMy9m3q3cRIKG7GRS 4hg0NMLHh24vRojMbGbLJiq07cwvAfsMXV0cBha3tf8wAf8egxHvlnt1/jSX6q0y25a4jJP82Ba DDCKL1lTELInejxIBGQZTmaRmIiPrv+ExxO10fIvW/F39niqY9E3RcljRqqtSR1OPbBhiOQ354+ 28cTWA++FOAg== X-Google-Smtp-Source: ABdhPJwtSaWppfMG6wKHyuHOUT1iYYtoHkJ8pZTxzN7T5l3q+5QhN4whVDqkvE5ly0n4LH0pS7sK8g== X-Received: by 2002:a05:6a00:1f08:b0:4fa:8a47:cf35 with SMTP id be8-20020a056a001f0800b004fa8a47cf35mr19432254pfb.22.1648033035520; Wed, 23 Mar 2022 03:57:15 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id d11-20020aa7868b000000b004f768dfe93asm25535927pfo.176.2022.03.23.03.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 03:57:15 -0700 (PDT) From: Boris Sukholitko To: netdev@vger.kernel.org, "David S . Miller" , Jakub Kicinski , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "Gustavo A . R . Silva" , Vladimir Oltean , Eric Dumazet , zhang kai , Yoshiki Komachi Cc: Ilya Lifshits , Boris Sukholitko Subject: [PATCH net-next 2/5] Reduce identation after is_key_vlan refactoring Date: Wed, 23 Mar 2022 12:55:59 +0200 Message-Id: <20220323105602.30072-3-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220323105602.30072-1-boris.sukholitko@broadcom.com> References: <20220323105602.30072-1-boris.sukholitko@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Whitespace only. Signed-off-by: Boris Sukholitko --- net/sched/cls_flower.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 6c355b293f02..e073787dfd1d 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1530,21 +1530,21 @@ static int fl_set_key(struct net *net, struct nlattr **tb, sizeof(key->eth.src)); if (is_vlan_key(tb[TCA_FLOWER_KEY_ETH_TYPE], ðertype, key, mask)) { - fl_set_key_vlan(tb, ethertype, TCA_FLOWER_KEY_VLAN_ID, - TCA_FLOWER_KEY_VLAN_PRIO, &key->vlan, - &mask->vlan); - - if (is_vlan_key(tb[TCA_FLOWER_KEY_VLAN_ETH_TYPE], ðertype, key, mask)) { - fl_set_key_vlan(tb, ethertype, - TCA_FLOWER_KEY_CVLAN_ID, - TCA_FLOWER_KEY_CVLAN_PRIO, - &key->cvlan, &mask->cvlan); - fl_set_key_val(tb, &key->basic.n_proto, - TCA_FLOWER_KEY_CVLAN_ETH_TYPE, - &mask->basic.n_proto, - TCA_FLOWER_UNSPEC, - sizeof(key->basic.n_proto)); - } + fl_set_key_vlan(tb, ethertype, TCA_FLOWER_KEY_VLAN_ID, + TCA_FLOWER_KEY_VLAN_PRIO, &key->vlan, + &mask->vlan); + + if (is_vlan_key(tb[TCA_FLOWER_KEY_VLAN_ETH_TYPE], ðertype, key, mask)) { + fl_set_key_vlan(tb, ethertype, + TCA_FLOWER_KEY_CVLAN_ID, + TCA_FLOWER_KEY_CVLAN_PRIO, + &key->cvlan, &mask->cvlan); + fl_set_key_val(tb, &key->basic.n_proto, + TCA_FLOWER_KEY_CVLAN_ETH_TYPE, + &mask->basic.n_proto, + TCA_FLOWER_UNSPEC, + sizeof(key->basic.n_proto)); + } } if (key->basic.n_proto == htons(ETH_P_IP) ||