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

Commit 541e1159 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum: Extract mlxsw_sp_stp_spms_state() 



Instead of duplicating the decision regarding port forwarding state made
by mlxsw_sp_port_vid_stp_set(), extract the decision-making into a new
function and reuse.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d4fd361

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

+13 −13
Original line number Diff line number Diff line
@@ -441,29 +441,29 @@ static void mlxsw_sp_txhdr_construct(struct sk_buff *skb, 
	mlxsw_tx_hdr_type_set(txhdr, MLXSW_TXHDR_TYPE_CONTROL);

}



int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state)

enum mlxsw_reg_spms_state mlxsw_sp_stp_spms_state(u8 state)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	enum mlxsw_reg_spms_state spms_state;

	char *spms_pl;

	int err;



	switch (state) {

	case BR_STATE_FORWARDING:

		spms_state = MLXSW_REG_SPMS_STATE_FORWARDING;

		break;

		return MLXSW_REG_SPMS_STATE_FORWARDING;

	case BR_STATE_LEARNING:

		spms_state = MLXSW_REG_SPMS_STATE_LEARNING;

		break;

		return MLXSW_REG_SPMS_STATE_LEARNING;

	case BR_STATE_LISTENING: /* fall-through */

	case BR_STATE_DISABLED: /* fall-through */

	case BR_STATE_BLOCKING:

		spms_state = MLXSW_REG_SPMS_STATE_DISCARDING;

		break;

		return MLXSW_REG_SPMS_STATE_DISCARDING;

	default:

		BUG();

	}

}



int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state)

{

	enum mlxsw_reg_spms_state spms_state = mlxsw_sp_stp_spms_state(state);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char *spms_pl;

	int err;



	spms_pl = kmalloc(MLXSW_REG_SPMS_LEN, GFP_KERNEL);

	if (!spms_pl)

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

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu, 
int mlxsw_sp_port_ets_maxrate_set(struct mlxsw_sp_port *mlxsw_sp_port,

				  enum mlxsw_reg_qeec_hr hr, u8 index,

				  u8 next_index, u32 maxrate);

enum mlxsw_reg_spms_state mlxsw_sp_stp_spms_state(u8 stp_state);

int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state);

int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, bool enable);