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

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

net/mlx5e: Replace call to MPWQE free with dealloc in interface down flow 



No need to expose the MPWQE free function to control path.
The dealloc function already exposed, use it.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 6a8fab17

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -892,7 +892,6 @@ bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq); 
bool mlx5e_post_rx_mpwqes(struct mlx5e_rq *rq);

bool mlx5e_post_rx_mpwqes(struct mlx5e_rq *rq);

void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix);

void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix);

void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix);

void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix);

void mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi);

struct sk_buff *

struct sk_buff *

mlx5e_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

mlx5e_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

				u16 cqe_bcnt, u32 head_offset, u32 page_idx);

				u16 cqe_bcnt, u32 head_offset, u32 page_idx);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -877,7 +877,7 @@ static void mlx5e_free_rx_descs(struct mlx5e_rq *rq) 




		/* UMR WQE (if in progress) is always at wq->head */

		/* UMR WQE (if in progress) is always at wq->head */

		if (rq->mpwqe.umr_in_progress)

		if (rq->mpwqe.umr_in_progress)

			mlx5e_free_rx_mpwqe(rq, &rq->mpwqe.info[wq->head]);

			rq->dealloc_wqe(rq, wq->head);





		while (!mlx5_wq_ll_is_empty(wq)) {

		while (!mlx5_wq_ll_is_empty(wq)) {

			struct mlx5e_rx_wqe_ll *wqe;

			struct mlx5e_rx_wqe_ll *wqe;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -396,7 +396,7 @@ mlx5e_copy_skb_header_mpwqe(struct device *pdev, 
	}

	}

}

}





void mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi)

static void mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi)

{

{

	const bool no_xdp_xmit =

	const bool no_xdp_xmit =

		bitmap_empty(wi->xdp_xmit_bitmap, MLX5_MPWRQ_PAGES_PER_WQE);

		bitmap_empty(wi->xdp_xmit_bitmap, MLX5_MPWRQ_PAGES_PER_WQE);