Skip to content

Commit 3116ad0

Browse files
vladimirolteandavem330
authored andcommitted
net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag
When a VLAN is added to a bridge port and it doesn't exist on the bridge device yet, it gets created for the multicast context, but it is 'hidden', since it doesn't have the BRENTRY flag yet: ip link add br0 type bridge && ip link set swp0 master br0 bridge vlan add dev swp0 vid 100 # the master VLAN 100 gets created bridge vlan add dev br0 vid 100 self # that VLAN becomes brentry just now All switchdev drivers ignore switchdev notifiers for VLAN entries which have the BRENTRY unset, and for good reason: these are merely private data structures used by the bridge driver. So we might just as well not notify those at all. Cleanup in the switchdev drivers that check for the BRENTRY flag is now possible, and will be handled separately, since those checks just became dead code. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b2bc58d commit 3116ad0

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

net/bridge/br_vlan.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,12 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags,
284284
}
285285
br_multicast_port_ctx_init(p, v, &v->port_mcast_ctx);
286286
} else {
287-
err = br_switchdev_port_vlan_add(dev, v->vid, flags, extack);
288-
if (err && err != -EOPNOTSUPP)
289-
goto out;
287+
if (br_vlan_should_use(v)) {
288+
err = br_switchdev_port_vlan_add(dev, v->vid, flags,
289+
extack);
290+
if (err && err != -EOPNOTSUPP)
291+
goto out;
292+
}
290293
br_multicast_ctx_init(br, v, &v->br_mcast_ctx);
291294
v->priv_flags |= BR_VLFLAG_GLOBAL_MCAST_ENABLED;
292295
}

0 commit comments

Comments
 (0)