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

Commit b681c481 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove unnecessary wqe_sz field from RQ buffer 



Field is used only locally within the RQ create function.
The use of a local variable is sufficient.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 89e89f7a

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ struct mlx5e_rq { 
		} mpwqe;

	};

	struct {

		u32            wqe_sz;    /* wqe data buffer size */

		u16            headroom;

		u8             page_order;

		u8             map_dir;   /* dma map direction */

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+3 −5
Original line number Diff line number Diff line
@@ -618,8 +618,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
		rq->mpwqe.log_stride_sz = params->mpwqe_log_stride_sz;

		rq->mpwqe.num_strides = BIT(params->mpwqe_log_num_strides);



		rq->buff.wqe_sz = rq->mpwqe.num_strides << rq->mpwqe.log_stride_sz;

		byte_count = rq->buff.wqe_sz;

		byte_count = rq->mpwqe.num_strides << rq->mpwqe.log_stride_sz;



		err = mlx5e_create_rq_umr_mkey(mdev, rq);

		if (err)
@@ -654,15 +653,14 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
			goto err_rq_wq_destroy;

		}



		rq->buff.wqe_sz = params->lro_en  ?

		byte_count = params->lro_en  ?

				params->lro_wqe_sz :

				MLX5E_SW2HW_MTU(c->priv, c->netdev->mtu);

#ifdef CONFIG_MLX5_EN_IPSEC

		if (MLX5_IPSEC_DEV(mdev))

			rq->buff.wqe_sz += MLX5E_METADATA_ETHER_LEN;

			byte_count += MLX5E_METADATA_ETHER_LEN;

#endif

		rq->wqe.page_reuse = !params->xdp_prog && !params->lro_en;

		byte_count = rq->buff.wqe_sz;



		/* calc the required page order */

		rq->wqe.frag_sz = MLX5_SKB_FRAG_SZ(rq->buff.headroom + byte_count);