From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
There is one enum block that is shared.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
providers/i40iw/i40iw-abi.h | 11 +++--------
providers/i40iw/i40iw_uverbs.c | 6 +++---
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/providers/i40iw/i40iw-abi.h b/providers/i40iw/i40iw-abi.h
index 8b35a8decfb9cf..469cf3d12104d0 100644
--- a/providers/i40iw/i40iw-abi.h
+++ b/providers/i40iw/i40iw-abi.h
@@ -32,10 +32,11 @@
*
*******************************************************************************/
-#ifndef I40IW_ABI_H
-#define I40IW_ABI_H
+#ifndef PROVIDER_I40IW_ABI_H
+#define PROVIDER_I40IW_ABI_H
#include <infiniband/kern-abi.h>
+#include <rdma/i40iw-abi.h>
#define I40IW_ABI_VER 5
@@ -74,12 +75,6 @@ struct i40iw_ucreate_cq_resp {
__u32 reserved;
};
-enum i40iw_umemreg_type {
- I40IW_UMEMREG_TYPE_MEM = 0x0000,
- I40IW_UMEMREG_TYPE_QP = 0x0001,
- I40IW_UMEMREG_TYPE_CQ = 0x0002
-};
-
struct i40iw_ureg_mr {
struct ibv_reg_mr ibv_cmd;
__u16 reg_type;
diff --git a/providers/i40iw/i40iw_uverbs.c b/providers/i40iw/i40iw_uverbs.c
index d77a46911ef30a..9a363b95d2b6c5 100644
--- a/providers/i40iw/i40iw_uverbs.c
+++ b/providers/i40iw/i40iw_uverbs.c
@@ -159,7 +159,7 @@ struct ibv_mr *i40iw_ureg_mr(struct ibv_pd *pd, void *addr, size_t length, int a
if (!mr)
return NULL;
- cmd.reg_type = I40IW_UMEMREG_TYPE_MEM;
+ cmd.reg_type = IW_MEMREG_TYPE_MEM;
if (ibv_cmd_reg_mr(pd, addr, length, (uintptr_t)addr,
access, mr, &cmd.ibv_cmd, sizeof(cmd),
@@ -254,7 +254,7 @@ struct ibv_cq *i40iw_ucreate_cq(struct ibv_context *context, int cqe,
memset(info.cq_base, 0, totalsize);
info.shadow_area = (u64 *)((u8 *)info.cq_base + (cq_pages << 12));
- reg_mr_cmd.reg_type = I40IW_UMEMREG_TYPE_CQ;
+ reg_mr_cmd.reg_type = IW_MEMREG_TYPE_CQ;
reg_mr_cmd.cq_pages = cq_pages;
@@ -526,7 +526,7 @@ static int i40iw_vmapped_qp(struct i40iw_uqp *iwuqp, struct ibv_pd *pd,
info->rq = &info->sq[sqsize / I40IW_QP_WQE_MIN_SIZE];
info->shadow_area = info->rq[rqsize / I40IW_QP_WQE_MIN_SIZE].elem;
- reg_mr_cmd.reg_type = I40IW_UMEMREG_TYPE_QP;
+ reg_mr_cmd.reg_type = IW_MEMREG_TYPE_QP;
reg_mr_cmd.sq_pages = sq_pages;
reg_mr_cmd.rq_pages = rq_pages;
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
