refresh

diff --git a/meta b/meta
index 9fcad6b75fa7f1ec3d5529ff08aa083c97e7175d..7491a43dfc5c3100a88d13c0bd958ff45d7a33ae 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: fa21aa86f1a4bc2baf65bcd745ccb41bbbb23e4a
-Head: 507cbeb0fc7d9084866738188a46e2e45681e0f4
+Previous: 7b5100e277d02fb51b1ceacc182d9bc5998d421d
+Head: 5648b2c274068715935e4f85e69fc4247c934a5e
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
   srq_ex: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
   xrc_qp: e53f15c90e27fbc87ec085fddadfcff3b0277ba2
-  open_qp: 650fcf85a110956549526188a28b057c7ff0b722
-  refresh-temp: 507cbeb0fc7d9084866738188a46e2e45681e0f4
+  open_qp: 5648b2c274068715935e4f85e69fc4247c934a5e
 Unapplied:
   open_qp_man: 16944620e2b43e9ba26925d8e3d6cfe310a0108a
   xrc_sample: 7c2b4dd047c9433d781d158a8e749b3c76d07459

diff --git a/patches/open_qp b/patches/open_qp
index d61cfe205f2bd79457178362de0025efe5cf55ce..1ddcb675dc742254d3a53295f8862dc8fcce3764 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
 Bottom: bc8327dcf31fc9105d0b313d6ef1a9a0c4539aad
-Top:    d060377d3b733e72d01730fe7763e998b9b08257
+Top:    3ba15716492beef1b0ea750d964417b836135254
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-19 09:19:59 -0700
 
@@ -17,14 +17,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index cd1855f..7fc5ecd 100644
+index cd1855f..47f37b8 100644
 --- a/include/infiniband/driver.h
 +++ b/include/infiniband/driver.h
 @@ -164,6 +164,10 @@ 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);
-+int ibv_cmd_open_qp(struct verbs_context *context,
++int ibv_cmd_open_qp(struct ibv_context *context,
 +                  struct verbs_qp *qp, struct ibv_qp_open_attr *attr,
 +                  struct ibv_open_qp *cmd, size_t cmd_size,
 +                  struct ibv_create_qp_resp *resp, size_t resp_size);
@@ -144,14 +144,14 @@ index 56c5db0..964f7f2 100644
   */
  int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 diff --git a/src/cmd.c b/src/cmd.c
-index b8ab132..1bacb13 100644
+index b8ab132..132f9bc 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -809,6 +809,51 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
        return 0;
  }
  
-+int ibv_cmd_open_qp(struct verbs_context *context, struct verbs_qp *qp,
++int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp,
 +                  struct ibv_qp_open_attr *attr,
 +                  struct ibv_open_qp *cmd, size_t cmd_size,
 +                  struct ibv_create_qp_resp *resp, size_t resp_size)
@@ -173,13 +173,13 @@ index b8ab132..1bacb13 100644
 +      cmd->qpn         = attr->qp_num;
 +      cmd->qp_type     = attr->qp_type;
 +
-+      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);
 +
 +      qp->qp.handle     = resp->qp_handle;
-+      qp->qp.context    = &context->context;
++      qp->qp.context    = context;
 +      qp->qp.qp_context = attr->qp_context;
 +      qp->qp.pd         = NULL;
 +      qp->qp.send_cq    = qp->qp.recv_cq = NULL;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6690915..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: d060377d3b733e72d01730fe7763e998b9b08257
-Top:    3ba15716492beef1b0ea750d964417b836135254
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 14:25:08 -0700
-
-Refresh of open_qp
-
----
-
-diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index 7fc5ecd..47f37b8 100644
---- a/include/infiniband/driver.h
-+++ b/include/infiniband/driver.h
-@@ -164,7 +164,7 @@ 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);
--int ibv_cmd_open_qp(struct verbs_context *context,
-+int ibv_cmd_open_qp(struct ibv_context *context,
-                   struct verbs_qp *qp, struct ibv_qp_open_attr *attr,
-                   struct ibv_open_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 1bacb13..132f9bc 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -809,7 +809,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
-       return 0;
- }
- 
--int ibv_cmd_open_qp(struct verbs_context *context, struct verbs_qp *qp,
-+int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp,
-                   struct ibv_qp_open_attr *attr,
-                   struct ibv_open_qp *cmd, size_t cmd_size,
-                   struct ibv_create_qp_resp *resp, size_t resp_size)
-@@ -831,13 +831,13 @@ int ibv_cmd_open_qp(struct verbs_context *context, struct verbs_qp *qp,
-       cmd->qpn         = attr->qp_num;
-       cmd->qp_type     = attr->qp_type;
- 
--      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);
- 
-       qp->qp.handle     = resp->qp_handle;
--      qp->qp.context    = &context->context;
-+      qp->qp.context    = context;
-       qp->qp.qp_context = attr->qp_context;
-       qp->qp.pd         = NULL;
-       qp->qp.send_cq    = qp->qp.recv_cq = NULL;