Skip to content

Commit 68f5c12

Browse files
vladimirolteandavem330
authored andcommitted
net: bridge: fix error in br_multicast_add_port when CONFIG_NET_SWITCHDEV=n
When CONFIG_NET_SWITCHDEV is disabled, the shim for switchdev_port_attr_set inside br_mc_disabled_update returns -EOPNOTSUPP. This is not caught, and propagated to the caller of br_multicast_add_port, preventing ports from joining the bridge. Reported-by: Christian Borntraeger <[email protected]> Fixes: ae1ea84 ("net: bridge: propagate error code and extack from br_mc_disabled_update") Signed-off-by: Vladimir Oltean <[email protected]> Acked-by: Florian Fainelli <[email protected]> Tested-by: Christian Borntraeger <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 36e69da commit 68f5c12

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/bridge/br_multicast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ int br_multicast_add_port(struct net_bridge_port *port)
16251625
br_opt_get(port->br,
16261626
BROPT_MULTICAST_ENABLED),
16271627
NULL);
1628-
if (err)
1628+
if (err && err != -EOPNOTSUPP)
16291629
return err;
16301630

16311631
port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats);

0 commit comments

Comments
 (0)