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

Commit 9571e828 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: reg: Extract mlxsw_reg_ritr_mac_pack() 



Unlike other interface types, loopback RIFs do not have MAC address. So
drop the corresponding argument from mlxsw_reg_ritr_pack() and move it
to a new function. Call that from callers of mlxsw_reg_ritr_pack.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-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 1e659ebf

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

+5 −2
Original line number Diff line number Diff line
@@ -4263,8 +4263,7 @@ static inline void mlxsw_reg_ritr_sp_if_pack(char *payload, bool lag, 


static inline void mlxsw_reg_ritr_pack(char *payload, bool enable,

				       enum mlxsw_reg_ritr_if_type type,

				       u16 rif, u16 vr_id, u16 mtu,

				       const char *mac)

				       u16 rif, u16 vr_id, u16 mtu)

{

	bool op = enable ? MLXSW_REG_RITR_RIF_CREATE : MLXSW_REG_RITR_RIF_DEL;
@@ -4280,6 +4279,10 @@ static inline void mlxsw_reg_ritr_pack(char *payload, bool enable, 
	mlxsw_reg_ritr_lb_en_set(payload, 1);

	mlxsw_reg_ritr_virtual_router_set(payload, vr_id);

	mlxsw_reg_ritr_mtu_set(payload, mtu);

}



static inline void mlxsw_reg_ritr_mac_pack(char *payload, const char *mac)

{

	mlxsw_reg_ritr_if_mac_memcpy_to(payload, mac);

}

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

+4 −3
Original line number Diff line number Diff line
@@ -4955,8 +4955,8 @@ static int mlxsw_sp_rif_subport_op(struct mlxsw_sp_rif *rif, bool enable) 


	rif_subport = mlxsw_sp_rif_subport_rif(rif);

	mlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_SP_IF,

			    rif->rif_index, rif->vr_id, rif->dev->mtu,

			    rif->dev->dev_addr);

			    rif->rif_index, rif->vr_id, rif->dev->mtu);

	mlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr);

	mlxsw_reg_ritr_sp_if_pack(ritr_pl, rif_subport->lag,

				  rif_subport->lag ? rif_subport->lag_id :

						     rif_subport->system_port,
@@ -4998,7 +4998,8 @@ static int mlxsw_sp_rif_vlan_fid_op(struct mlxsw_sp_rif *rif, 
	char ritr_pl[MLXSW_REG_RITR_LEN];



	mlxsw_reg_ritr_pack(ritr_pl, enable, type, rif->rif_index, rif->vr_id,

			    rif->dev->mtu, rif->dev->dev_addr);

			    rif->dev->mtu);

	mlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr);

	mlxsw_reg_ritr_fid_set(ritr_pl, type, vid_fid);



	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl);