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

Commit 6c72a3d0 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Change bridge port attributes only when bridged 



Bridge port attributes are offloaded to hardware when invoked with SELF
flag set, but it really makes no sense to reflect them when port is not
bridged.

Allow a user to change these attribute only when port is bridged and
initialize them correctly when joining or leaving a bridge.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a8f4525

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

+11 −6
Original line number Diff line number Diff line
@@ -1364,9 +1364,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_sp_port->dev = dev;

	mlxsw_sp_port->mlxsw_sp = mlxsw_sp;

	mlxsw_sp_port->local_port = local_port;

	mlxsw_sp_port->learning = 1;

	mlxsw_sp_port->learning_sync = 1;

	mlxsw_sp_port->uc_flood = 1;

	bytes = DIV_ROUND_UP(VLAN_N_VID, BITS_PER_BYTE);

	mlxsw_sp_port->active_vlans = kzalloc(bytes, GFP_KERNEL);

	if (!mlxsw_sp_port->active_vlans) {
@@ -1989,16 +1986,24 @@ static int mlxsw_sp_port_bridge_join(struct mlxsw_sp_port *mlxsw_sp_port) 
	 * own VLANs.

	 */

	err = mlxsw_sp_port_kill_vid(dev, 0, 1);

	if (!err)

	if (err)

		return err;



	mlxsw_sp_port->learning = 1;

	mlxsw_sp_port->learning_sync = 1;

	mlxsw_sp_port->uc_flood = 1;

	mlxsw_sp_port->bridged = 1;



	return err;

	return 0;

}



static int mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port)

{

	struct net_device *dev = mlxsw_sp_port->dev;



	mlxsw_sp_port->learning = 0;

	mlxsw_sp_port->learning_sync = 0;

	mlxsw_sp_port->uc_flood = 0;

	mlxsw_sp_port->bridged = 0;



	/* Add implicit VLAN interface in the device, so that untagged

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

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	bool set;

	int err;



	if (!mlxsw_sp_port->bridged)

		return -EINVAL;



	if (switchdev_trans_ph_prepare(trans))

		return 0;