From patchwork Mon Apr 11 13:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12809105 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 556A2C433F5 for ; Mon, 11 Apr 2022 13:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346511AbiDKNd6 (ORCPT ); Mon, 11 Apr 2022 09:33:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346494AbiDKNdy (ORCPT ); Mon, 11 Apr 2022 09:33:54 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A9953BA79 for ; Mon, 11 Apr 2022 06:31:40 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id h23-20020a17090a051700b001c9c1dd3acbso16834995pjh.3 for ; Mon, 11 Apr 2022 06:31:40 -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=2iKk1NC5vu/go8aiYfz/cKZD1nvWmZy1aYMh9FXVXKU=; b=G4VL1zYVABri8ocaw29zhhnXaRj+k5eBrTT+4pdp0TG28/Hz0GSQN1JIXq1AoN57By X6HRQQI3HAtMpn+5ehOYZbjKuKgxGTgTlhYposN/FbfphjpB27iddA+LRlIBhXluB9Eu CbFGv6Sbu1WBLmrRD8s4HRmJoCGrVKsXey0V0= 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=2iKk1NC5vu/go8aiYfz/cKZD1nvWmZy1aYMh9FXVXKU=; b=VLuNnQ3mfNWdMxs4kqgSEzkTVu9SnKNJomj7NQ97vkMsMo+1cErf66ff4KyC763ehZ Kvg/PD25vqZ9bYasIQ5oQB6dN50iJkmdA+KRsN/n9jWXmT9YuAUx2v1C+bDQUNNyOMwk 1g39dZZ6tv2+pBioybG5rRRb62DVURl8HWOU1Mdolobbd0Y5HEfXNoXIemz+pE24P5RP Lyxku1y3nmEWnZAgt3x/EgGpRx4JYYVc+QInGPxEIzmgSOdw8qPemQmyz8fYhmHC79i6 he7TxuCGPrgh63RtOIv2kfhFGG7+AsJd4oKks7m4wjv8UxORWpEF3xezZvk1RpmxkC2E W13Q== X-Gm-Message-State: AOAM533kN5G1dGMhdleVcMlu/yTvDeSfkPWeQBbzshceXUf9fd2B6JJV iOPSmVxVFMcnEgt0lswt5LJtL8PwFpXQpqdlRTqaiTZgt2tTzw+bh/xZNGo7HfQPhKZsIK3jlr/ xsZIOU0MhrfJlV0R5J7vEn+YWA0hqro4cHbZ+a88ToZTOixuqksSlmqeMxwxcrMVmhI6mIM7+L7 SbulSxu1fxlA== X-Google-Smtp-Source: ABdhPJyYdASWvbkCAN+dyKWtwzjAycG0iazT/L8+EXDRJ+xQ9xbSWdZAErXS7HhMwj6UUgYQyUFBcA== X-Received: by 2002:a17:90b:3ecb:b0:1c7:74f6:ae73 with SMTP id rm11-20020a17090b3ecb00b001c774f6ae73mr36617633pjb.236.1649683899263; Mon, 11 Apr 2022 06:31:39 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004f70d5e92basm35716311pfx.34.2022.04.11.06.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 06:31:38 -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: Mon, 11 Apr 2022 16:30:57 +0300 Message-Id: <20220411133100.18126-3-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220411133100.18126-1-boris.sukholitko@broadcom.com> References: <20220411133100.18126-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) ||