Commit 2e6a2d7b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum: Move max_width check up before count check 



The fact that the port cannot be split further should be checked before
checking the count, so move it.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarShalom Toledo <shalomt@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25911e1b

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

+6 −6
Original line number Diff line number Diff line
@@ -4128,12 +4128,6 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
		return max_width;

	}



	if (count != 2 && count != 4) {

		netdev_err(mlxsw_sp_port->dev, "Port can only be split into 2 or 4 ports\n");

		NL_SET_ERR_MSG_MOD(extack, "Port can only be split into 2 or 4 ports");

		return -EINVAL;

	}



	/* Split port with non-max module width cannot be split. */

	if (mlxsw_sp_port->mapping.width != max_width) {

		netdev_err(mlxsw_sp_port->dev, "Port cannot be split further\n");
@@ -4141,6 +4135,12 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
		return -EINVAL;

	}



	if (count != 2 && count != 4) {

		netdev_err(mlxsw_sp_port->dev, "Port can only be split into 2 or 4 ports\n");

		NL_SET_ERR_MSG_MOD(extack, "Port can only be split into 2 or 4 ports");

		return -EINVAL;

	}



	/* Make sure we have enough slave (even) ports for the split. */

	if (count == 2) {

		offset = local_ports_in_2x;

CRA Git | Maintained and supported by SUSTech CRA and CCSE