mlxsw: spectrum_switchdev: Ignore bridge VLAN events (ea472175) · Commits · 戴 / test

A follow-up patch enables emitting VLAN notifications for the bridge CPU port in addition to the existing slave port notifications. These notifications have orig_dev set to the bridge in question. Because there's no specific support for these VLANs, just ignore the notifications to maintain the current behavior. Signed-off-by:

Petr Machata <petrm@mellanox.com> Reviewed-by:

Ido Schimmel <idosch@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1144,6 +1144,9 @@ static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
		struct mlxsw_sp_bridge_port *bridge_port;
		u16 vid;

		if (netif_is_bridge_master(orig_dev))
		return -EOPNOTSUPP;

		if (switchdev_trans_ph_prepare(trans))
		return 0;

		@@ -1741,6 +1744,9 @@ static int mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,
		struct mlxsw_sp_bridge_port *bridge_port;
		u16 vid;

		if (netif_is_bridge_master(orig_dev))
		return -EOPNOTSUPP;

		bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev);
		if (WARN_ON(!bridge_port))
		return -EINVAL;

Admin message