Commit 8aba32ce authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Fix arguments alignment 



Suppress the following checkpatch.pl check [1] by adding a variable to
store the IP-in-IP options. Noticed while adding equivalent IPv6 code in
subsequent patches.

[1]
CHECK: Alignment should match open parenthesis
+               mlxsw_reg_ritr_loopback_ipip4_pack(ritr_pl, lb_cf.lb_ipipt,
+
+ MLXSW_REG_RITR_LOOPBACK_IPIP_OPTIONS_GRE_KEY_PRESET,

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa6fd8f1

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

+5 −2
Original line number Diff line number Diff line
@@ -1536,19 +1536,22 @@ mlxsw_sp_rif_ipip_lb_op(struct mlxsw_sp_rif_ipip_lb *lb_rif, u16 ul_vr_id, 
			u16 ul_rif_id, bool enable)

{

	struct mlxsw_sp_rif_ipip_lb_config lb_cf = lb_rif->lb_config;

	enum mlxsw_reg_ritr_loopback_ipip_options ipip_options;

	struct mlxsw_sp_rif *rif = &lb_rif->common;

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	char ritr_pl[MLXSW_REG_RITR_LEN];

	u32 saddr4;



	ipip_options = MLXSW_REG_RITR_LOOPBACK_IPIP_OPTIONS_GRE_KEY_PRESET;

	switch (lb_cf.ul_protocol) {

	case MLXSW_SP_L3_PROTO_IPV4:

		saddr4 = be32_to_cpu(lb_cf.saddr.addr4);

		mlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_LOOPBACK_IF,

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

		mlxsw_reg_ritr_loopback_ipip4_pack(ritr_pl, lb_cf.lb_ipipt,

			    MLXSW_REG_RITR_LOOPBACK_IPIP_OPTIONS_GRE_KEY_PRESET,

			    ul_vr_id, ul_rif_id, saddr4, lb_cf.okey);

						   ipip_options, ul_vr_id,

						   ul_rif_id, saddr4,

						   lb_cf.okey);

		break;



	case MLXSW_SP_L3_PROTO_IPV6: