From patchwork Tue Apr 19 08:14:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12817586 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 5EFF2C433EF for ; Tue, 19 Apr 2022 08:16:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344958AbiDSISm (ORCPT ); Tue, 19 Apr 2022 04:18:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349832AbiDSISQ (ORCPT ); Tue, 19 Apr 2022 04:18:16 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49FFADF20 for ; Tue, 19 Apr 2022 01:15:08 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id be5so14668626plb.13 for ; Tue, 19 Apr 2022 01:15:08 -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=wMrfpHIoM6DCuiIz+x80fs9sMOyAP6IpMayogaNTw8A=; b=SMT2lS/I6u+xyfAMMWSkhQi3cMVTYijhD2cKlHtgVYLoaCLqnnZPX1wXzdjrYTTwU+ ROl2XQ0nWbzjnbtgGzg0Lfcjh3GpNHjJOSwk4xyHJGigLlOXXcIKDtuaflU2N0qRLkBy 1fGrXD0GHnjjLWhnlWCH4i8GYLoXl3Zcdeydg= 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=wMrfpHIoM6DCuiIz+x80fs9sMOyAP6IpMayogaNTw8A=; b=yLBFxYBlYX3baaT/9HM2fvIJ3u1rIaccKSVJArp2gVe7waRYBQfAeX8LGNqe+1UKoz boUJ/r+EbYPq+I97MosJn6HGJMgVRYBOYQ535zUwHWFczspRDkArcTtxul0+3h7JKb/1 c28gR0l9wZCPQdNeVtPbKNzyzKneJlSaZV5/c1cwjuVEdjLYNwHJ3q2XlB4x5JxkB8qP 4Ve1IHMEevObRQgLtH85pms7uB1gP8MIkWteC3YeSyLXHYBitMvPll8HE/8wRxF8hYhg bK52x/Y88/AR61OFWmH9UegVhmQq91RdF512GkCJfj6Ohp7dW1hSrRyjbE6zvWQTwRz7 cxEQ== X-Gm-Message-State: AOAM530VW+HIaFZGyscOvr3rYV1p7uOsizGfq1Q+ZihVbi/Vx2ls48Mw BvX+S6GmTv9/WQ0h/ZL0ftzEXxQIG1pbPU3d4czopIX0x5Dhj8Z1hCdaLB8TkGHktXA1iGw8ag6 hLnUJ53v2OrnDaKqpWLC+6Jr1mJUMZPozacH8vejkcFP5XhVw5bkmwxYjGzX0rdvGml6UTAEN9f 3wSvPd4p0F+g== X-Google-Smtp-Source: ABdhPJxWvXKWn82jBeTZotUaNId/ksw5LTH/hkoOQ1bStBhREFoyEX5zAoI7Hxw1PY+YyQbUvXbOTQ== X-Received: by 2002:a17:902:e743:b0:159:40a:a156 with SMTP id p3-20020a170902e74300b00159040aa156mr7450199plf.89.1650356107476; Tue, 19 Apr 2022 01:15:07 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id cp19-20020a056a00349300b0050a890c8c16sm4284570pfb.19.2022.04.19.01.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 01:15:06 -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 v4 2/5] net/sched: flower: Reduce identation after is_key_vlan refactoring Date: Tue, 19 Apr 2022 11:14:31 +0300 Message-Id: <20220419081434.5192-3-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220419081434.5192-1-boris.sukholitko@broadcom.com> References: <20220419081434.5192-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 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index c88d69ebe2c8..86fd0420ac4f 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1617,23 +1617,23 @@ 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, - TCA_FLOWER_KEY_VLAN_ETH_TYPE, - &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, - TCA_FLOWER_KEY_CVLAN_ETH_TYPE, - &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, + TCA_FLOWER_KEY_VLAN_ETH_TYPE, + &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, + TCA_FLOWER_KEY_CVLAN_ETH_TYPE, + &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) ||