Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b53bfd authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_switchdev: Allow port enslavement to a VLAN-unaware bridge 



Up until now we only allowed VLAN devices to be put in a VLAN-unaware
bridge, but some users need the ability to enslave physical ports as
well.

This is achieved by mapping the port and VID 1 to the bridge's vFID,
instead of the port and the VID used by the VLAN device.

The above is valid because as long as the port is not enslaved to a
bridge, VID 1 is guaranteed to be configured as PVID and egress
untagged.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Tested-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba6056a4

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

+5 −7
Original line number Diff line number Diff line
@@ -1882,14 +1882,10 @@ mlxsw_sp_bridge_8021d_port_join(struct mlxsw_sp_bridge_device *bridge_device, 
				struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	struct net_device *dev = bridge_port->dev;

	u16 vid;



	if (!is_vlan_dev(bridge_port->dev)) {

		NL_SET_ERR_MSG_MOD(extack, "Only VLAN devices can be enslaved to a VLAN-unaware bridge");

		return -EINVAL;

	}

	vid = vlan_dev_vlan_id(bridge_port->dev);



	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 1;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return -EINVAL;
@@ -1912,8 +1908,10 @@ mlxsw_sp_bridge_8021d_port_leave(struct mlxsw_sp_bridge_device *bridge_device, 
				 struct mlxsw_sp_port *mlxsw_sp_port)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	u16 vid = vlan_dev_vlan_id(bridge_port->dev);

	struct net_device *dev = bridge_port->dev;

	u16 vid;



	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 1;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return;