From 6d03a247468059b0e59c821ef39e6762d4d6fc30 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 23:00:51 +0200 Subject: Merging upstream version 6.9.2. Signed-off-by: Daniel Baumann --- drivers/infiniband/hw/mana/mana_ib.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'drivers/infiniband/hw/mana/mana_ib.h') diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 6acb5c281c..f83390eebb 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -45,12 +45,6 @@ struct mana_ib_adapter_caps { u32 max_inline_data_size; }; -struct mana_ib_queue { - struct ib_umem *umem; - u64 gdma_region; - u64 id; -}; - struct mana_ib_dev { struct ib_device ib_dev; struct gdma_dev *gdma_dev; @@ -88,8 +82,10 @@ struct mana_ib_mr { struct mana_ib_cq { struct ib_cq ibcq; - struct mana_ib_queue queue; + struct ib_umem *umem; int cqe; + u64 gdma_region; + u64 id; u32 comp_vector; }; @@ -173,10 +169,6 @@ int mana_ib_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, int mana_ib_gd_destroy_dma_region(struct mana_ib_dev *dev, mana_handle_t gdma_region); -int mana_ib_create_queue(struct mana_ib_dev *mdev, u64 addr, u32 size, - struct mana_ib_queue *queue); -void mana_ib_destroy_queue(struct mana_ib_dev *mdev, struct mana_ib_queue *queue); - struct ib_wq *mana_ib_create_wq(struct ib_pd *pd, struct ib_wq_init_attr *init_attr, struct ib_udata *udata); -- cgit v1.2.3