From ef3adb7ae051127f5dcf3cbc8f03e7aca4dcde48 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 26 Sep 2012 09:10:39 -0700 Subject: [PATCH] Refresh of srq_ex --- include/infiniband/driver.h | 17 +++++++++++++++++ include/infiniband/verbs.h | 14 -------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h index 46190fe..78f7111 100644 --- a/include/infiniband/driver.h +++ b/include/infiniband/driver.h @@ -64,6 +64,23 @@ struct verbs_xrcd { uint32_t handle; }; +enum verbs_srq_mask { + IBV_SRQ_TYPE = 1 << 0, + IBV_SRQ_XRCD = 1 << 1, + IBV_SRQ_CQ = 1 << 2, + IBV_SRQ_NUM = 1 << 3, + IBV_SRQ_RESERVED = 1 << 4 +}; + +struct verbs_srq { + struct ibv_srq srq; + uint32_t comp_mask; + enum ibv_srq_type srq_type; + struct ibv_xrcd *xrcd; + struct ibv_cq *cq; + uint32_t srq_num; +}; + typedef struct ibv_device *(*ibv_driver_init_func)(const char *uverbs_sys_path, int abi_version); diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h index d3c6669..e1dcda8 100644 --- a/include/infiniband/verbs.h +++ b/include/infiniband/verbs.h @@ -594,14 +594,6 @@ struct ibv_mw_bind { int mw_access_flags; }; -enum ibv_srq_mask { - IBV_SRQ_TYPE = 1 << 0, - IBV_SRQ_XRCD = 1 << 1, - IBV_SRQ_CQ = 1 << 2, - IBV_SRQ_NUM = 1 << 3, - IBV_SRQ_RESERVED = 1 << 4 -}; - struct ibv_srq { struct ibv_context *context; void *srq_context; @@ -611,12 +603,6 @@ struct ibv_srq { pthread_mutex_t mutex; pthread_cond_t cond; uint32_t events_completed; - - uint32_t comp_mask; - enum ibv_srq_type srq_type; - struct ibv_xrcd *xrcd; - struct ibv_cq *cq; - uint32_t srq_num; }; struct ibv_qp { -- 2.46.0