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

net/mlx5e: RX, Generalise name of non-linear SKB head size 



Make name more generic by dropping MPWRQ from it, as it will be
used also in Legacy RQ in a downstream patch.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ struct page_pool; 


#define MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW            0x2



#define MLX5_MPWRQ_SMALL_PACKET_THRESHOLD	(256)

#define MLX5E_RX_MAX_HEAD (256)



#define MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ                 (64 * 1024)

#define MLX5E_DEFAULT_LRO_TIMEOUT                       32

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

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ struct sk_buff * 
mlx5e_skb_from_cqe_mpwrq_nonlinear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

				   u16 cqe_bcnt, u32 head_offset, u32 page_idx)

{

	u16 headlen = min_t(u16, MLX5_MPWRQ_SMALL_PACKET_THRESHOLD, cqe_bcnt);

	u16 headlen = min_t(u16, MLX5E_RX_MAX_HEAD, cqe_bcnt);

	struct mlx5e_dma_info *di = &wi->umr.dma_info[page_idx];

	u32 frag_offset    = head_offset + headlen;

	u32 byte_cnt       = cqe_bcnt - headlen;
@@ -1078,7 +1078,7 @@ mlx5e_skb_from_cqe_mpwrq_nonlinear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *w 
	struct sk_buff *skb;



	skb = napi_alloc_skb(rq->cq.napi,

			     ALIGN(MLX5_MPWRQ_SMALL_PACKET_THRESHOLD, sizeof(long)));

			     ALIGN(MLX5E_RX_MAX_HEAD, sizeof(long)));

	if (unlikely(!skb)) {

		rq->stats->buff_alloc_err++;

		return NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int mlx5e_test_link_speed(struct mlx5e_priv *priv) 


#ifdef CONFIG_INET

/* loopback test */

#define MLX5E_TEST_PKT_SIZE (MLX5_MPWRQ_SMALL_PACKET_THRESHOLD - NET_IP_ALIGN)

#define MLX5E_TEST_PKT_SIZE (MLX5E_RX_MAX_HEAD - NET_IP_ALIGN)

static const char mlx5e_test_text[ETH_GSTRING_LEN] = "MLX5E SELF TEST";

#define MLX5E_TEST_MAGIC 0x5AEED15C001ULL

CRA Git | Maintained and supported by SUSTech CRA and CCSE