refresh (create temporary patch)

diff --git a/meta b/meta
index 9ff22e5dfaae6389bdc98c23b8d5ef283175ba0c..ecbb5fafc98d1e9e55530a2733a6d59a56a665f9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 50e17bcae5d9774493e1ba1c83f9aa964def079f
-Head: 2ce086df2927b3e9732253de35ed2bd3e4c021c5
+Previous: 59d4794476dbf03532bb57c197264a821a5c14af
+Head: e31e89876d04f9559478099496c821c5b1e0c112
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
   srq_ex: 2ce086df2927b3e9732253de35ed2bd3e4c021c5
+  refresh-temp: e31e89876d04f9559478099496c821c5b1e0c112
 Unapplied:
   compat-ex: 7cb34472bd00bc286569b726c7d38c6dd0dfe3b0
   xrc_qp: 6c98944a89c8f725d08f68a938954e10c7f09450

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e36b10b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,60 @@
+Bottom: 784a386f91d98852fe49e15ccf421e6423e8e596
+Top:    e1563f3afb59f9034fe7d7236e3d85eedfbfb15f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-09-26 11:31:30 -0700
+
+Refresh of srq_ex
+
+---
+
+diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
+index 30aa573..dccfd1f 100644
+--- a/include/infiniband/driver.h
++++ b/include/infiniband/driver.h
+@@ -134,7 +134,7 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
+                      struct ibv_create_srq *cmd, size_t cmd_size,
+                      struct ibv_create_srq_resp *resp, size_t resp_size);
+ int ibv_cmd_create_srq_ex(struct ibv_pd *pd,
+-                        struct ibv_srq *srq, struct ibv_srq_init_attr_ex *attr_ex,
++                        struct verbs_srq *srq, struct ibv_srq_init_attr_ex *attr_ex,
+                         struct ibv_create_xsrq *cmd, size_t cmd_size,
+                         struct ibv_create_srq_resp *resp, size_t resp_size);
+ int ibv_cmd_modify_srq(struct ibv_srq *srq,
+diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
+index c75b239..f339561 100644
+--- a/include/infiniband/verbs.h
++++ b/include/infiniband/verbs.h
+@@ -1083,7 +1083,7 @@ int ibv_query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr);
+ 
+ static inline uint32_t ibv_get_srq_num(struct ibv_srq *srq)
+ {
+-      struct verbs_context *vctx = verbs_get_ctx_op(pd->context, get_srq_num);
++      struct verbs_context *vctx = verbs_get_ctx_op(srq->context, get_srq_num);
+       if (!vctx) {
+               errno = ENOSYS;
+               return 0;
+diff --git a/src/cmd.c b/src/cmd.c
+index 68146ad..e03676d 100644
+--- a/src/cmd.c
++++ b/src/cmd.c
+@@ -525,16 +525,16 @@ int ibv_cmd_create_srq_ex(struct ibv_pd *pd,
+       srq->srq_type = (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
+                       attr_ex->srq_type : IBV_SRQT_BASIC;
+       if (srq->srq_type == IBV_SRQT_XRC) {
+-              srq->comp_mask |= IBV_SRQ_NUM;
++              srq->comp_mask |= VERBS_SRQ_NUM;
+               srq->srq_num = resp->srqn;
+       }
+       if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
+-              srq->comp_mask |= IBV_SRQ_XRCD;
++              srq->comp_mask |= VERBS_SRQ_XRCD;
+               srq->xrcd = vxrcd;
+       }
+       if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) {
+-              srq->comp_mask |= IBV_SRQ_CQ;
+-              srq->cq = srq_init_attr_ex->cq;
++              srq->comp_mask |= VERBS_SRQ_CQ;
++              srq->cq = attr_ex->cq;
+       }
+ 
+       attr_ex->attr.max_wr = resp->max_wr;