Commit 773ce33a authored by Amit Cohen's avatar Amit Cohen Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_switchdev: Create common functions for VLAN-aware bridge 



The code in mlxsw_sp_bridge_8021q_port_{join, leave}() can be used also
for 802.1ad bridge.

Move the code to functions called
mlxsw_sp_bridge_vlan_aware_port_{join, leave}() and call them from
mlxsw_sp_bridge_8021q_port_{join, leave}() respectively to enable code
reuse.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3ae7a65b

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

+22 −7
Original line number Diff line number Diff line
@@ -1979,8 +1979,7 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, 
}



static int

mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device,

				struct mlxsw_sp_bridge_port *bridge_port,

mlxsw_sp_bridge_vlan_aware_port_join(struct mlxsw_sp_bridge_port *bridge_port,

				     struct mlxsw_sp_port *mlxsw_sp_port,

				     struct netlink_ext_ack *extack)

{
@@ -1996,16 +1995,32 @@ mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device, 
	return 0;

}



static void

mlxsw_sp_bridge_8021q_port_leave(struct mlxsw_sp_bridge_device *bridge_device,

static int

mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device,

				struct mlxsw_sp_bridge_port *bridge_port,

				 struct mlxsw_sp_port *mlxsw_sp_port)

				struct mlxsw_sp_port *mlxsw_sp_port,

				struct netlink_ext_ack *extack)

{

	return mlxsw_sp_bridge_vlan_aware_port_join(bridge_port, mlxsw_sp_port,

						    extack);

}



static void

mlxsw_sp_bridge_vlan_aware_port_leave(struct mlxsw_sp_port *mlxsw_sp_port)

{

	/* Make sure untagged frames are allowed to ingress */

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID,

			       ETH_P_8021Q);

}



static void

mlxsw_sp_bridge_8021q_port_leave(struct mlxsw_sp_bridge_device *bridge_device,

				 struct mlxsw_sp_bridge_port *bridge_port,

				 struct mlxsw_sp_port *mlxsw_sp_port)

{

	mlxsw_sp_bridge_vlan_aware_port_leave(mlxsw_sp_port);

}



static int

mlxsw_sp_bridge_8021q_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,

				 const struct net_device *vxlan_dev, u16 vid,