From patchwork Tue Apr 12 10:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12810512 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 A5FDFC433FE for ; Tue, 12 Apr 2022 11:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345660AbiDLLPp (ORCPT ); Tue, 12 Apr 2022 07:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355371AbiDLLPZ (ORCPT ); Tue, 12 Apr 2022 07:15:25 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4A4995A0A for ; Tue, 12 Apr 2022 03:03:15 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id bo5so17056036pfb.4 for ; Tue, 12 Apr 2022 03:03:15 -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=7HSa34Vzmptg/tOFFE7Ys9hDlo/RWae1LwIxkQPxykA=; b=Y++hKSB6AP+ZKzUjLy64gKZyuck0FOqkPrbkXURqBgQVXumG0W35ZSxFsvYJ8WClqG oNUMFhO6e4+AR3Shk5JjcPX8lC4n75KmVa9C/gj00A4Ujy88b61Pw6eaQOTHdC89DH8A G3PG16rMn5GeP1/RHmnuQ1lpfIA7yZUmFoMv8= 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=7HSa34Vzmptg/tOFFE7Ys9hDlo/RWae1LwIxkQPxykA=; b=hcbDD7wegTpbS77pJxwyuOlJMw4zwjG539yeBMDzvltwW8HGi8AjA4mpU2YCWNswYl OMHEvuk4IFGeuadNRRLmcKPI+WHjTN01DizPlGaRanVJVUFIrgbrIPsanqRziGtRrw46 AtQQ9ALE1nWeZurvw/uE93kRujHLxLpW59E1M9JoS0LeAid+MDpqgIQAkTNVzob/2SFv DQdBcNoaRJHltgNZGiOJUP7GberTGeU3mH36xDL8l836CNgXbewF4/7GJNUF31oOrtN1 I+dFDp6aMuIxz3pptVnEKg3jsOuppzSWbWABfup8Bv9jtHYli3dzyvX3KPVIdGkhVrOS A8jQ== X-Gm-Message-State: AOAM533KxykrziqnwPSFXcinzt2tSvsrc5wjIQ/rg4FJ1E4xrziBnqH3 xul3FFofyDr3Rp35i9izDJiOJvs3fK1OEkpir52ilps4Ylk+Oz5xzBDTqx3ZVXkm4O1ROSRLc0t zsDjyxHWfs0tLImhksTekqGxFesneZtGj9n+Y5eIt4891r4rFKGE6+NUByJ+vDan1r2WTFoWZEX uTqoUU/QWnnw== X-Google-Smtp-Source: ABdhPJzU1x+u0k+2/FEUgyKj8LZ8C2Y9erbuDw6TTmaICDgyLPrXUBxWyyN3LoQDwUQQ0NEjlwcnig== X-Received: by 2002:a65:5302:0:b0:39c:e41e:e8ff with SMTP id m2-20020a655302000000b0039ce41ee8ffmr19414978pgq.305.1649757794719; Tue, 12 Apr 2022 03:03:14 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id u17-20020a056a00159100b004faef351ebcsm37020020pfk.45.2022.04.12.03.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 03:03:14 -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 v2 2/5] net/sched: flower: Reduce identation after is_key_vlan refactoring Date: Tue, 12 Apr 2022 13:02:33 +0300 Message-Id: <20220412100236.27244-3-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220412100236.27244-1-boris.sukholitko@broadcom.com> References: <20220412100236.27244-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 9a9b7849e657..8725aa1bb21e 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1611,21 +1611,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) ||