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 4edb2eec8179f333f7eb728cf4b6a98c724e5a71..b0758c5c3490bbe3a0bcc8482577858bb86eb2ab 100644 (file)
--- 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);