From patchwork Thu Apr 14 12:51:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12813494 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 EE546C433F5 for ; Thu, 14 Apr 2022 12:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243628AbiDNMyj (ORCPT ); Thu, 14 Apr 2022 08:54:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243280AbiDNMye (ORCPT ); Thu, 14 Apr 2022 08:54:34 -0400 Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DA3C92328 for ; Thu, 14 Apr 2022 05:52:10 -0700 (PDT) Received: by mail-qt1-x82a.google.com with SMTP id p1so3415582qtq.10 for ; Thu, 14 Apr 2022 05:52:10 -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=AqLfZi5/uSEUDrtJnA6UZjmX7SJi9XmknRX7cH2HBG0=; b=hy3cqG+aY7/3oVQC/6+uSfZt8lEL/JQrBNtyY1gt/aOQSKG/fMwUEVzp4DISxgezT/ daVfgmPIPLmqHOdTptosL9SG4E+aoqHxG1845x7hX5TJ/DVNajblRdd/98HV15hEnq2G omdlMoyAhUBxxqvUxLTrgYTYHzpILVk3Pin8g= 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=AqLfZi5/uSEUDrtJnA6UZjmX7SJi9XmknRX7cH2HBG0=; b=KNSGgFpuwCJUxb2e7JQhDtlUPm9gEWFjWPr0DfdzCNRyohNpHQTK+IvErYwh0FDUpD 3BpMxPmnx3qB9SfeNt0nUCs5prTiW5R1lMrubysUt2ze0PMjgmG4EnvboPyadVJ5XXe9 jeXtcq8ADGeZZQnlM7yO8HEe8jtfHb/Ss47ELJO4LqBR++J4jxhwQnAk2dRsOuVWwzr3 a5ubtlbYYSndvrl12RPWQBN6qakR3GfyHuX2Ym2wM5TbNhtJiRE4cxIhw51wsH0IM9GH eRDG/2BsOY1tqKA/7GgRBULyxmBCNQS3QtT6SNdzubziqoahPdVxqnr0fxgQIqxUhlPz 1yEQ== X-Gm-Message-State: AOAM531j8+2GPLUlqXdn51FCAW6zBbtAC1Z63Ba9FgAnD2bFct3sFq27 oHBHpwYO7cJtb5FNY+kCyBfKn87NFov4MwAbA8Tdde5i2qCHgt4HKp6QxY6Q435GlnszlM8rXkq 28+WX3r1j/Exs8ms3tGWrhQ4tCf5U7Pvh8UO9IOQVvzaclgvclP8/Pebdbghskl2RRH61pJWrnU xhazfpzcn1Yw== X-Google-Smtp-Source: ABdhPJz4FnEbE7x5HdYEgl8Qw1nBP+GEPquNNCAj1y18Rrgg6eJuRrXfuTn3B7IZqWYk3P+CDqIYFQ== X-Received: by 2002:ac8:59d4:0:b0:2e1:f86d:b38c with SMTP id f20-20020ac859d4000000b002e1f86db38cmr1595988qtf.285.1649940729142; Thu, 14 Apr 2022 05:52:09 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id o10-20020a05620a15ca00b0069c39e2970bsm875910qkm.80.2022.04.14.05.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 05:52:08 -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 , Paolo Abeni Cc: Ilya Lifshits , Boris Sukholitko Subject: [PATCH net-next v3 2/5] net/sched: flower: Reduce identation after is_key_vlan refactoring Date: Thu, 14 Apr 2022 15:51:18 +0300 Message-Id: <20220414125121.13599-3-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220414125121.13599-1-boris.sukholitko@broadcom.com> References: <20220414125121.13599-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) ||