From: Jiri Pirko <jiri@nvidia.com>
Date: Tue, 10 Nov 2020 09:48:54 +0000 (+0200)
Subject: mlxsw: spectrum_router: Use RALUE pack helper from abort function
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a9c21d5f70f123fc79bf140f8a221efe18916e6;p=linux.git

mlxsw: spectrum_router: Use RALUE pack helper from abort function

Unify the RALUE register payload packing and use the
__mlxsw_sp_fib_entry_ralue_pack() helper from
__mlxsw_sp_router_set_abort_trap().

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 4edb2eec8179f..b0758c5c3490b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -5764,8 +5764,8 @@ static int __mlxsw_sp_router_set_abort_trap(struct mlxsw_sp *mlxsw_sp,
 		if (err)
 			return err;
 
-		mlxsw_reg_ralue_pack(ralue_pl, ralxx_proto,
-				     MLXSW_REG_RALUE_OP_WRITE_WRITE, vr->id, 0);
+		mlxsw_sp_fib_entry_ralue_pack(ralue_pl, proto,
+					      MLXSW_SP_FIB_ENTRY_OP_WRITE, vr->id, 0, NULL);
 		mlxsw_reg_ralue_act_ip2me_pack(ralue_pl);
 		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralue),
 				      ralue_pl);