[PATCH 5/6 bpf-next] Remove use of umem _rq variants from Mellanox driver.

[Jonathan Lemon]

Signed-off-by: Jonathan Lemon <jonathan.le...@gmail.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
index 8d24eaa660a8..e116b1fde797 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
@@ -12,7 +12,7 @@ bool mlx5e_xsk_pages_enough_umem(struct mlx5e_rq *rq, int 
count)
        /* Check in advance that we have enough frames, instead of allocating
         * one-by-one, failing and moving frames to the Reuse Ring.
         */
-       return xsk_umem_has_addrs_rq(rq->umem, count);
+       return xsk_umem_has_addrs(rq->umem, count);
 }
 
 int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,
@@ -21,7 +21,7 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,
        struct xdp_umem *umem = rq->umem;
        u64 handle;
 
-       if (!xsk_umem_peek_addr_rq(umem, &handle))
+       if (!xsk_umem_peek_addr(umem, &handle))
                return -ENOMEM;
 
        dma_info->xsk.handle = handle + rq->buff.umem_headroom;
@@ -34,7 +34,7 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,
         */
        dma_info->addr = xdp_umem_get_dma(umem, handle);
 
-       xsk_umem_discard_addr_rq(umem);
+       xsk_umem_discard_addr(umem);
 
        dma_sync_single_for_device(rq->pdev, dma_info->addr, PAGE_SIZE,
                                   DMA_BIDIRECTIONAL);
-- 
2.17.1