net/mlx5e: Take packet_merge params directly from the RX res struct

As packet_merge params structure is saved on the RX resources structure, there
is no need to pass it separately.

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
index 0015a81..24c32f7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
@@ -37,7 +37,6 @@ struct mlx5e_rx_res {
 /* API for rx_res_rss_* */
 
 static int mlx5e_rx_res_rss_init_def(struct mlx5e_rx_res *res,
-                                    const struct mlx5e_packet_merge_param *init_pkt_merge_param,
                                     unsigned int init_nch)
 {
        bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;
@@ -52,7 +51,7 @@ static int mlx5e_rx_res_rss_init_def(struct mlx5e_rx_res *res,
                return -ENOMEM;
 
        err = mlx5e_rss_init(rss, res->mdev, inner_ft_support, res->drop_rqn,
-                            init_pkt_merge_param);
+                            &res->pkt_merge_param);
        if (err)
                goto err_rss_free;
 
@@ -277,8 +276,7 @@ struct mlx5e_rx_res *mlx5e_rx_res_alloc(void)
        return kvzalloc(sizeof(struct mlx5e_rx_res), GFP_KERNEL);
 }
 
-static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res,
-                                     const struct mlx5e_packet_merge_param *init_pkt_merge_param)
+static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res)
 {
        bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;
        struct mlx5e_tir_builder *builder;
@@ -309,7 +307,7 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res,
                mlx5e_tir_builder_build_rqt(builder, res->mdev->mlx5e_res.hw_objs.td.tdn,
                                            mlx5e_rqt_get_rqtn(&res->channels[ix].direct_rqt),
                                            inner_ft_support);
-               mlx5e_tir_builder_build_packet_merge(builder, init_pkt_merge_param);
+               mlx5e_tir_builder_build_packet_merge(builder, &res->pkt_merge_param);
                mlx5e_tir_builder_build_direct(builder);
 
                err = mlx5e_tir_init(&res->channels[ix].direct_tir, builder, res->mdev, true);
@@ -339,7 +337,7 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res,
                mlx5e_tir_builder_build_rqt(builder, res->mdev->mlx5e_res.hw_objs.td.tdn,
                                            mlx5e_rqt_get_rqtn(&res->channels[ix].xsk_rqt),
                                            inner_ft_support);
-               mlx5e_tir_builder_build_packet_merge(builder, init_pkt_merge_param);
+               mlx5e_tir_builder_build_packet_merge(builder, &res->pkt_merge_param);
                mlx5e_tir_builder_build_direct(builder);
 
                err = mlx5e_tir_init(&res->channels[ix].xsk_tir, builder, res->mdev, true);
@@ -454,11 +452,11 @@ int mlx5e_rx_res_init(struct mlx5e_rx_res *res, struct mlx5_core_dev *mdev,
        res->pkt_merge_param = *init_pkt_merge_param;
        init_rwsem(&res->pkt_merge_param_sem);
 
-       err = mlx5e_rx_res_rss_init_def(res, init_pkt_merge_param, init_nch);
+       err = mlx5e_rx_res_rss_init_def(res, init_nch);
        if (err)
                goto err_out;
 
-       err = mlx5e_rx_res_channels_init(res, init_pkt_merge_param);
+       err = mlx5e_rx_res_channels_init(res);
        if (err)
                goto err_rss_destroy;