refresh (create temporary patch)

diff --git a/meta b/meta
index d63cc1f9f41995d2be3bc5c381cf1831d72a2d3c..40ac7aa406aa2b7b59d69d68cbe6de7d40a97112 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 05a844cc2c12e035810427fd10758ef391b81765
-Head: a7db461faf2c3c46b8ff733a78ca38036940a558
+Previous: 78c13ea9b4cfa9206ebade054e98d3e5bfe34af9
+Head: da094c31b5bd34aeffa600f90cf9f7660612f5c8
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
   srq_ex: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
   xrc_qp: a7db461faf2c3c46b8ff733a78ca38036940a558
+  refresh-temp: da094c31b5bd34aeffa600f90cf9f7660612f5c8
 Unapplied:
   open_qp: 5a153ad1d91a85e22f8736a391f049b9610c5dd3
   open_qp_man: 16944620e2b43e9ba26925d8e3d6cfe310a0108a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..035286a
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,53 @@
+Bottom: ee34e262e30ef01242f6fa16121a4b50e7b91108
+Top:    bc8327dcf31fc9105d0b313d6ef1a9a0c4539aad
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-09-27 14:24:19 -0700
+
+Refresh of xrc_qp
+
+---
+
+diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
+index a29a1bc..cd1855f 100644
+--- a/include/infiniband/driver.h
++++ b/include/infiniband/driver.h
+@@ -160,7 +160,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
+                     struct ibv_qp *qp, struct ibv_qp_init_attr *attr,
+                     struct ibv_create_qp *cmd, size_t cmd_size,
+                     struct ibv_create_qp_resp *resp, size_t resp_size);
+-int ibv_cmd_create_qp_ex(struct verbs_context *context,
++int ibv_cmd_create_qp_ex(struct ibv_context *context,
+                        struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex,
+                        struct ibv_create_qp *cmd, size_t cmd_size,
+                        struct ibv_create_qp_resp *resp, size_t resp_size);
+diff --git a/src/cmd.c b/src/cmd.c
+index 596bb62..b8ab132 100644
+--- a/src/cmd.c
++++ b/src/cmd.c
+@@ -659,7 +659,7 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
+       return 0;
+ }
+ 
+-int ibv_cmd_create_qp_ex(struct verbs_context *context,
++int ibv_cmd_create_qp_ex(struct ibv_context *context,
+                        struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex,
+                        struct ibv_create_qp *cmd, size_t cmd_size,
+                        struct ibv_create_qp_resp *resp, size_t resp_size)
+@@ -699,7 +699,7 @@ int ibv_cmd_create_qp_ex(struct verbs_context *context,
+       cmd->is_srq          = !!attr_ex->srq;
+       cmd->reserved        = 0;
+ 
+-      if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size)
++      if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
+               return errno;
+ 
+       (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+@@ -730,7 +730,7 @@ int ibv_cmd_create_qp_ex(struct verbs_context *context,
+ 
+       qp->qp.handle           = resp->qp_handle;
+       qp->qp.qp_num           = resp->qpn;
+-      qp->qp.context          = &context->context;
++      qp->qp.context          = context;
+       qp->qp.qp_context       = attr_ex->qp_context;
+       qp->qp.pd               = attr_ex->pd;
+       qp->qp.send_cq          = attr_ex->send_cq;