refresh

diff --git a/meta b/meta
index 79829464fae1506fc1b4d5147571b6fa7693952b..ee6e4e386511d16f7074d4eab3f8c4804c55002a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 58f7cb952994a8895ad214a32c81ccdee1e623ae
-Head: 967560873b629c0ae986f5c8531eab02a4a552fd
+Previous: 951b820dda70cfaec6ce821ebe6b328a3bf7f413
+Head: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
-  srq_ex: bc1d17a25e6ce1e956c29b4b1e7fd86e4880703e
-  refresh-temp: 967560873b629c0ae986f5c8531eab02a4a552fd
+  srq_ex: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
 Unapplied:
   xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
   open_qp: 5a153ad1d91a85e22f8736a391f049b9610c5dd3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b7d9b58..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: cb2972a6b5c7955c5979af7426814d3a115a5ed5
-Top:    adadbb2be659503c8b5d511f70971b54a9ef67b3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 14:22:38 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index c670dc1..fc7c591 100644
---- a/include/infiniband/driver.h
-+++ b/include/infiniband/driver.h
-@@ -133,7 +133,7 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
-                      struct ibv_srq *srq, struct ibv_srq_init_attr *attr,
-                      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 verbs_context *context,
-+int ibv_cmd_create_srq_ex(struct ibv_context *context,
-                         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);
-diff --git a/src/cmd.c b/src/cmd.c
-index d46f1f2..462c58e 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -481,7 +481,7 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
-       return 0;
- }
- 
--int ibv_cmd_create_srq_ex(struct verbs_context *context,
-+int ibv_cmd_create_srq_ex(struct ibv_context *context,
-                         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)
-@@ -514,13 +514,13 @@ int ibv_cmd_create_srq_ex(struct verbs_context *context,
-               cmd->cq_handle   = attr_ex->cq->handle;
-       }
- 
--      if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size)
-+      if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
-               return errno;
- 
-       VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
- 
-       srq->srq.handle           = resp->srq_handle;
--      srq->srq.context          = &context->context;
-+      srq->srq.context          = context;
-       srq->srq.srq_context      = attr_ex->srq_context;
-       srq->srq.pd               = attr_ex->pd;
-       srq->srq.events_completed = 0;

diff --git a/patches/srq_ex b/patches/srq_ex
index c3f5aa78c954875093c3d9e32eaccb01ae853a9a..26ac20e795f6c25f965c531d62aa42dcfd473621 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: 87b27489a0f1ae8e3a6eb34a11056bca16a2c292
-Top:    cb2972a6b5c7955c5979af7426814d3a115a5ed5
+Top:    adadbb2be659503c8b5d511f70971b54a9ef67b3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index 88d94c3..c670dc1 100644
+index 88d94c3..fc7c591 100644
 --- a/include/infiniband/driver.h
 +++ b/include/infiniband/driver.h
 @@ -64,6 +64,23 @@ struct verbs_xrcd {
@@ -54,7 +54,7 @@ index 88d94c3..c670dc1 100644
                       struct ibv_srq *srq, struct ibv_srq_init_attr *attr,
                       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 verbs_context *context,
++int ibv_cmd_create_srq_ex(struct ibv_context *context,
 +                        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);
@@ -204,14 +204,14 @@ index 4d68cd3..946a127 100644
   * ibv_destroy_srq - Destroys the specified SRQ.
   * @srq: The SRQ to destroy.
 diff --git a/src/cmd.c b/src/cmd.c
-index f9beded..d46f1f2 100644
+index f9beded..462c58e 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -481,6 +481,75 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
        return 0;
  }
  
-+int ibv_cmd_create_srq_ex(struct verbs_context *context,
++int ibv_cmd_create_srq_ex(struct ibv_context *context,
 +                        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)
@@ -244,13 +244,13 @@ index f9beded..d46f1f2 100644
 +              cmd->cq_handle   = attr_ex->cq->handle;
 +      }
 +
-+      if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size)
++      if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
 +              return errno;
 +
 +      VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
 +
 +      srq->srq.handle           = resp->srq_handle;
-+      srq->srq.context          = &context->context;
++      srq->srq.context          = context;
 +      srq->srq.srq_context      = attr_ex->srq_context;
 +      srq->srq.pd               = attr_ex->pd;
 +      srq->srq.events_completed = 0;