From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12EE9CF2590 for ; Mon, 14 Oct 2024 06:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=n/x9sCHASM4Rf3zEKoLCrNEGmjLCGHbguwi/XAkNj6o=; b=3KlQpUZ7nH1/jQwVkp+QGO9FoD EI7iPpbAbJyOhE9MtHwcpaR76+Q4focirq0LB0k0Cf/oWmwVzC1+gOAmu0ga1sj6uq9HwKEpSf3BE JlPgJElpBv3NG2K+kDEqGQemWno+RDAVA4MUMlVDXHRGhlvjn0XiDSdRLeTeKK6SOekStkYEzSwWb to3bjqgfK9pCwF9xNgjuIV6O5cRaEKymMDssth8ceTEReQMIMgWzPm0xCCfwToivLS9wznYQhqJPL 6nfbca3o4I17vuGblbH/RuG3rZ2ofHPd4W+e1oLRfgc47DQ0fI5RJ1aSViL2JI0Y/IcK3BPjVHKq0 GC3yc8Qw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0Eir-00000003v6p-2a0U; Mon, 14 Oct 2024 06:38:29 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0EhR-00000003utz-22xj for linux-arm-kernel@lists.infradead.org; Mon, 14 Oct 2024 06:37:03 +0000 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-5c96b2a11e7so1753995a12.3 for ; Sun, 13 Oct 2024 23:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall-org.20230601.gappssmtp.com; s=20230601; t=1728887819; x=1729492619; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=n/x9sCHASM4Rf3zEKoLCrNEGmjLCGHbguwi/XAkNj6o=; b=K2q+6sDgKM/JBfqFd/vC7aNDBGliGnmCKvxMObGa8qBocRvoSIE2cvLWP4N/IQOsgg Vv8lu2ZZXjGYb/CZY2UVBHNDsw3M5/mGwwjdo8Cc0CD0HkqvgVS08WSRxhu8AfhZw7tN tnXVTAC6BN55v1w8nLniMxDQkAB5tsdBb1pvH+WnQ7BEbGt8adBaM10Y/MJuZPP+rKKw FA1SlYMT6Z7TJ/AJAz5uqKIo/LD+I7pbUIntnnDGsSul7olcEm/c/Yx9/CtYItwBCro2 ke+ZcXcCf1xmicQHLzAqNBCbnPXseCoK9DIG/8+iX0QGH/Lf20vM+f4JXpaGzktzBePJ +C4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728887819; x=1729492619; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=n/x9sCHASM4Rf3zEKoLCrNEGmjLCGHbguwi/XAkNj6o=; b=otxnIBhCsgLdIGR1cLpb9VmFx33JpZF+0TROrdiXLrc4A/W+ClME3Z1EaI4j9x8/sK 5HghOhHa4YzI7OKk0U3g3uvPtg32cAAKsU3yjCj1BJyU/foQpFWcLLjSSs/8WwNuJ05b jWFzo0mEtnhZtCOwKC9CLUAVaJxv97BDkdc3GkrnrS1n62rN5JtM+z0VEQY9Ekm1Rgow 6+anxgpYdqj/hvbvLb510DxwOJVvkfGNaukgW87hoZslVlKNC2Mx/J+5Y/NyNXKihXo5 kaS+uOHWQlmL9Y2g9K2cwMXjKOAtxZwcw45WsC9AROGuLFjfC4xKP8L+siwhBPllUD2m LTag== X-Forwarded-Encrypted: i=1; AJvYcCWJLPQ/izSG3GCyW7L2aXMV8/djWodGAti+FkmqBsEEu1CRQ3hZjgw58Zb8EMIgwY9+mTkM18nqE5fSklfXV6SG@lists.infradead.org X-Gm-Message-State: AOJu0Yx69gCXxjSPEzybJ4o4dEpTvD066pfSP6cSsMcQL77TCkZ1Kv/T 1RMtRelP/L5FXOoaJbY0+vHkGqcN3dMYyZHnTrqYjONzwVc/7JFFaqts/QENg+Y= X-Google-Smtp-Source: AGHT+IHOmz4mXDYoNl9wKMY13pPq7T3XsGapXwSYgN3NOm+dxPajvUmbY2eZ6VnNrvCAhA5bOXjuSw== X-Received: by 2002:a17:907:ea2:b0:a9a:33c:f6e1 with SMTP id a640c23a62f3a-a9a033cf8b4mr405516566b.5.1728887819334; Sun, 13 Oct 2024 23:36:59 -0700 (PDT) Received: from [192.168.0.245] ([62.73.69.208]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99fcb57647sm206072266b.129.2024.10.13.23.36.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Oct 2024 23:36:58 -0700 (PDT) Message-ID: <6c0154a9-b21d-4f1d-af74-19690dad68a6@blackwall.org> Date: Mon, 14 Oct 2024 09:36:57 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v1 net-next 04/12] bridge: br_vlan_fill_forward_path_pvid: Add port to port To: Eric Woudstra , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Matthias Brugger , AngeloGioacchino Del Regno , Jiri Pirko , Sebastian Andrzej Siewior , Lorenzo Bianconi , Frank Wunderlich , Daniel Golle Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org References: <20241013185509.4430-1-ericwouds@gmail.com> <20241013185509.4430-5-ericwouds@gmail.com> Content-Language: en-US From: Nikolay Aleksandrov In-Reply-To: <20241013185509.4430-5-ericwouds@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241013_233701_622655_F4D71F45 X-CRM114-Status: GOOD ( 17.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 13/10/2024 21:55, Eric Woudstra wrote: > Lookup vlan group from bridge port, if it is passed as argument. > > Signed-off-by: Eric Woudstra > --- > net/bridge/br_private.h | 1 + > net/bridge/br_vlan.c | 6 +++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index d4bedc87b1d8..8da7798f9368 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -1581,6 +1581,7 @@ bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr, > const struct net_bridge_vlan *range_end); > > void br_vlan_fill_forward_path_pvid(struct net_bridge *br, > + struct net_bridge_port *p, > struct net_device_path_ctx *ctx, > struct net_device_path *path); > int br_vlan_fill_forward_path_mode(struct net_bridge *br, You haven't updated the !CONFIG_BRIDGE_VLAN_FILTERING version of this helper. > diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c > index 9c2fffb827ab..1830d7d617cd 100644 > --- a/net/bridge/br_vlan.c > +++ b/net/bridge/br_vlan.c > @@ -1441,6 +1441,7 @@ int br_vlan_get_pvid_rcu(const struct net_device *dev, u16 *p_pvid) > EXPORT_SYMBOL_GPL(br_vlan_get_pvid_rcu); > > void br_vlan_fill_forward_path_pvid(struct net_bridge *br, > + struct net_bridge_port *p, > struct net_device_path_ctx *ctx, > struct net_device_path *path) > { > @@ -1453,7 +1454,10 @@ void br_vlan_fill_forward_path_pvid(struct net_bridge *br, > if (!br_opt_get(br, BROPT_VLAN_ENABLED)) > return; > > - vg = br_vlan_group(br); > + if (p) > + vg = nbp_vlan_group(p); > + else > + vg = br_vlan_group(br); > > if (idx >= 0 && > ctx->vlan[idx].proto == br->vlan_proto) {