* [PATCH net-next] net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa
@ 2021-08-13 23:04 Vladimir Oltean
2021-08-16 10:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Vladimir Oltean @ 2021-08-13 23:04 UTC (permalink / raw)
To: netdev, Jakub Kicinski, David S. Miller
Cc: Florian Fainelli, Andrew Lunn, Vivien Didelot
During the development of the blamed patch, the "bool broadcast"
argument of dsa_port_tag_8021q_vlan_{add,del} was originally called
"bool local", and the meaning was the exact opposite.
Due to a rookie mistake where the patch was modified at the last minute
without retesting, the instances of dsa_port_tag_8021q_vlan_{add,del}
are called with the wrong values. During setup and teardown, cross-chip
notifiers should not be broadcast to all DSA trees, while during
bridging, they should.
Fixes: 724395f4dc95 ("net: dsa: tag_8021q: don't broadcast during setup/teardown")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
net/dsa/tag_8021q.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index e6d5f3b4fd89..f8f7b7c34e7d 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -362,12 +362,12 @@ int dsa_tag_8021q_bridge_join(struct dsa_switch *ds,
continue;
/* Install the RX VID of the targeted port in our VLAN table */
- err = dsa_port_tag_8021q_vlan_add(dp, targeted_rx_vid, false);
+ err = dsa_port_tag_8021q_vlan_add(dp, targeted_rx_vid, true);
if (err)
return err;
/* Install our RX VID into the targeted port's VLAN table */
- err = dsa_port_tag_8021q_vlan_add(targeted_dp, rx_vid, false);
+ err = dsa_port_tag_8021q_vlan_add(targeted_dp, rx_vid, true);
if (err)
return err;
}
@@ -451,7 +451,7 @@ static int dsa_tag_8021q_port_setup(struct dsa_switch *ds, int port)
* L2 forwarding rules still take precedence when there are no VLAN
* restrictions, so there are no concerns about leaking traffic.
*/
- err = dsa_port_tag_8021q_vlan_add(dp, rx_vid, true);
+ err = dsa_port_tag_8021q_vlan_add(dp, rx_vid, false);
if (err) {
dev_err(ds->dev,
"Failed to apply RX VID %d to port %d: %pe\n",
@@ -463,7 +463,7 @@ static int dsa_tag_8021q_port_setup(struct dsa_switch *ds, int port)
vlan_vid_add(master, ctx->proto, rx_vid);
/* Finally apply the TX VID on this port and on the CPU port */
- err = dsa_port_tag_8021q_vlan_add(dp, tx_vid, true);
+ err = dsa_port_tag_8021q_vlan_add(dp, tx_vid, false);
if (err) {
dev_err(ds->dev,
"Failed to apply TX VID %d on port %d: %pe\n",
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa
2021-08-13 23:04 [PATCH net-next] net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa Vladimir Oltean
@ 2021-08-16 10:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-16 10:20 UTC (permalink / raw)
To: Vladimir Oltean; +Cc: netdev, kuba, davem, f.fainelli, andrew, vivien.didelot
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Sat, 14 Aug 2021 02:04:22 +0300 you wrote:
> During the development of the blamed patch, the "bool broadcast"
> argument of dsa_port_tag_8021q_vlan_{add,del} was originally called
> "bool local", and the meaning was the exact opposite.
>
> Due to a rookie mistake where the patch was modified at the last minute
> without retesting, the instances of dsa_port_tag_8021q_vlan_{add,del}
> are called with the wrong values. During setup and teardown, cross-chip
> notifiers should not be broadcast to all DSA trees, while during
> bridging, they should.
>
> [...]
Here is the summary with links:
- [net-next] net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa
https://git.kernel.org/netdev/net-next/c/b2b891334111
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-16 10:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-13 23:04 [PATCH net-next] net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa Vladimir Oltean
2021-08-16 10:20 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.