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

Commit 26a4ea0f authored by Elad Raz's avatar Elad Raz Committed by David S. Miller
Browse files

mlxsw: Disable vlan_filtering for non .1D bridge 



When a port is bridged, the bridge must be vlan aware bridge (.1Q)
or the bridging should be on top of VLAN interfaces (.1D bridge).

Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4a13055

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

+21 −0
Original line number Diff line number Diff line
@@ -299,6 +299,22 @@ static int mlxsw_sp_port_attr_br_ageing_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	return mlxsw_sp_ageing_set(mlxsw_sp, ageing_time);

}



static int mlxsw_sp_port_attr_br_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port,

					  struct switchdev_trans *trans,

					  struct net_device *orig_dev,

					  bool vlan_enabled)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;



	/* SWITCHDEV_TRANS_PREPARE phase */

	if ((!vlan_enabled) && (mlxsw_sp->master_bridge.dev == orig_dev)) {

		netdev_err(mlxsw_sp_port->dev, "Bridge must be vlan-aware\n");

		return -EINVAL;

	}



	return 0;

}



static int mlxsw_sp_port_attr_set(struct net_device *dev,

				  const struct switchdev_attr *attr,

				  struct switchdev_trans *trans)
@@ -323,6 +339,11 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev, 
		err = mlxsw_sp_port_attr_br_ageing_set(mlxsw_sp_port, trans,

						       attr->u.ageing_time);

		break;

	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:

		err = mlxsw_sp_port_attr_br_vlan_set(mlxsw_sp_port, trans,

						     attr->orig_dev,

						     attr->u.vlan_filtering);

		break;

	default:

		err = -EOPNOTSUPP;

		break;