From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
The existing structs conflict with the kernel header versions, rename
them.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
providers/cxgb3/iwch-abi.h | 17 +++++++++--------
providers/cxgb3/iwch.c | 2 +-
providers/cxgb3/verbs.c | 12 ++++++------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/providers/cxgb3/iwch-abi.h b/providers/cxgb3/iwch-abi.h
index 50741ded5052be..81a76638c12e4d 100644
--- a/providers/cxgb3/iwch-abi.h
+++ b/providers/cxgb3/iwch-abi.h
@@ -34,34 +34,35 @@
#include <stdint.h>
#include <infiniband/kern-abi.h>
+#include <rdma/cxgb3-abi.h>
-struct iwch_alloc_ucontext_resp {
+struct uiwch_alloc_ucontext_resp {
struct ib_uverbs_get_context_resp ibv_resp;
};
-struct iwch_alloc_pd_resp {
+struct uiwch_alloc_pd_resp {
struct ib_uverbs_alloc_pd_resp ibv_resp;
uint32_t pdid;
};
-struct iwch_create_cq {
+struct uiwch_create_cq {
struct ibv_create_cq ibv_cmd;
uint64_t user_rptr_addr;
};
-struct iwch_reg_mr_resp {
+struct uiwch_reg_mr_resp {
struct ib_uverbs_reg_mr_resp ibv_resp;
uint32_t pbl_addr;
};
-struct iwch_create_cq_resp_v0 {
+struct uiwch_create_cq_resp_v0 {
struct ib_uverbs_create_cq_resp ibv_resp;
uint64_t physaddr;
uint32_t cqid;
uint32_t size_log2;
};
-struct iwch_create_cq_resp_v1 {
+struct uiwch_create_cq_resp_v1 {
struct ib_uverbs_create_cq_resp ibv_resp;
uint64_t physaddr;
uint32_t cqid;
@@ -70,11 +71,11 @@ struct iwch_create_cq_resp_v1 {
uint32_t reserved; /* for proper alignment */
};
-struct iwch_create_qp {
+struct uiwch_create_qp {
struct ibv_create_qp ibv_cmd;
};
-struct iwch_create_qp_resp {
+struct uiwch_create_qp_resp {
struct ib_uverbs_create_qp_resp ibv_resp;
uint64_t physaddr;
uint64_t doorbell;
diff --git a/providers/cxgb3/iwch.c b/providers/cxgb3/iwch.c
index c68626a9ae7516..a92403d0c245eb 100644
--- a/providers/cxgb3/iwch.c
+++ b/providers/cxgb3/iwch.c
@@ -122,7 +122,7 @@ static struct verbs_context *iwch_alloc_context(struct ibv_device *ibdev,
{
struct iwch_context *context;
struct ibv_get_context cmd;
- struct iwch_alloc_ucontext_resp resp;
+ struct uiwch_alloc_ucontext_resp resp;
struct iwch_device *rhp = to_iwch_dev(ibdev);
context = verbs_init_and_alloc_context(ibdev, cmd_fd, context, ibv_ctx,
diff --git a/providers/cxgb3/verbs.c b/providers/cxgb3/verbs.c
index 17a88fa1bdd9f3..676dde96f8838e 100644
--- a/providers/cxgb3/verbs.c
+++ b/providers/cxgb3/verbs.c
@@ -75,7 +75,7 @@ int iwch_query_port(struct ibv_context *context, uint8_t port,
struct ibv_pd *iwch_alloc_pd(struct ibv_context *context)
{
struct ibv_alloc_pd cmd;
- struct iwch_alloc_pd_resp resp;
+ struct uiwch_alloc_pd_resp resp;
struct iwch_pd *pd;
pd = malloc(sizeof *pd);
@@ -109,7 +109,7 @@ static struct ibv_mr *__iwch_reg_mr(struct ibv_pd *pd, void *addr,
{
struct iwch_mr *mhp;
struct ibv_reg_mr cmd;
- struct iwch_reg_mr_resp resp;
+ struct uiwch_reg_mr_resp resp;
struct iwch_device *dev = to_iwch_dev(pd->context->device);
mhp = malloc(sizeof *mhp);
@@ -168,8 +168,8 @@ int iwch_dereg_mr(struct ibv_mr *mr)
struct ibv_cq *iwch_create_cq(struct ibv_context *context, int cqe,
struct ibv_comp_channel *channel, int comp_vector)
{
- struct iwch_create_cq cmd;
- struct iwch_create_cq_resp_v1 resp;
+ struct uiwch_create_cq cmd;
+ struct uiwch_create_cq_resp_v1 resp;
struct iwch_cq *chp;
struct iwch_device *dev = to_iwch_dev(context->device);
int ret;
@@ -288,8 +288,8 @@ int iwch_post_srq_recv(struct ibv_srq *ibsrq, struct ibv_recv_wr *wr,
struct ibv_qp *iwch_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
{
- struct iwch_create_qp cmd;
- struct iwch_create_qp_resp resp;
+ struct uiwch_create_qp cmd;
+ struct uiwch_create_qp_resp resp;
struct iwch_qp *qhp;
struct iwch_device *dev = to_iwch_dev(pd->context->device);
int ret;
--
2.16.2
--
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
