refresh

diff --git a/meta b/meta
index a678d66b183c862f08f8b0af30323ea903c2deae..7f26ee99af3dff91f74be21eacd333e01a94dd31 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 303e5c61b1473880a87b05d5aec991282fa1c7a0
-Head: 394e26c3a3e14d0b662ed78c916d35174e805c9d
+Previous: 11d8c7723f8350432eed693ef5a454d9fef6ef24
+Head: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
   srq_ex: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
-  xrc_qp: ac729c797fae347489b0a0bdc67b5a75c07b116d
-  refresh-temp: 394e26c3a3e14d0b662ed78c916d35174e805c9d
+  xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
 Unapplied:
   open_qp: 58ba4627a48927caef4724399ef28a0464fe96ba
   open_qp_man: 2128e1c4feee2dd0117962223034e39d2762ea9c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 56efdda..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 5070521ac223503aef04524074f77d05be3860dd
-Top:    ee35ff9eb019eeb28d8e132079af9b57733715cf
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 11:33:21 -0700
-
-Refresh of xrc_qp
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index 8aac841..c8a1586 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -668,12 +668,18 @@ int ibv_cmd_create_qp_ex(struct verbs_context *context,
- 
-       IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size);
- 
-+      if (attr_ex->comp_mask >= IBV_QP_INIT_ATTR_RESERVED)
-+              return ENOSYS;
-+
-       cmd->user_handle     = (uintptr_t) qp;
- 
-       if (attr_ex->comp_mask & IBV_QP_INIT_ATTR_XRCD) {
-               vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd);
-               cmd->pd_handle  = vxrcd->handle;
-       } else {
-+              if (!(attr_ex->comp_mask & IBV_QP_INIT_ATTR_PD))
-+                      return EINVAL;
-+
-               cmd->pd_handle  = attr_ex->pd->handle;
-               cmd->send_cq_handle = attr_ex->send_cq->handle;

diff --git a/patches/xrc_qp b/patches/xrc_qp
index 71cc5de750cf82b2e9fbf464ac8b4d49a258d50c..1e1b0284678fb8ad76ac23ddd61d902e344dd88a 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
 Bottom: bd68ab33c07c691122588fd24837345e7a5c43cc
-Top:    5070521ac223503aef04524074f77d05be3860dd
+Top:    ee35ff9eb019eeb28d8e132079af9b57733715cf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -171,10 +171,10 @@ index 946a127..56c5db0 100644
   * ibv_modify_qp - Modify a queue pair.
   */
 diff --git a/src/cmd.c b/src/cmd.c
-index f58e30a..8aac841 100644
+index f58e30a..c8a1586 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -659,6 +659,92 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
+@@ -659,6 +659,98 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
        return 0;
  }
  
@@ -187,12 +187,18 @@ index f58e30a..8aac841 100644
 +
 +      IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size);
 +
++      if (attr_ex->comp_mask >= IBV_QP_INIT_ATTR_RESERVED)
++              return ENOSYS;
++
 +      cmd->user_handle     = (uintptr_t) qp;
 +
 +      if (attr_ex->comp_mask & IBV_QP_INIT_ATTR_XRCD) {
 +              vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd);
 +              cmd->pd_handle  = vxrcd->handle;
 +      } else {
++              if (!(attr_ex->comp_mask & IBV_QP_INIT_ATTR_PD))
++                      return EINVAL;
++
 +              cmd->pd_handle  = attr_ex->pd->handle;
 +              cmd->send_cq_handle = attr_ex->send_cq->handle;
 +
@@ -267,7 +273,7 @@ index f58e30a..8aac841 100644
  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,
-@@ -667,7 +753,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
+@@ -667,7 +759,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
        IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size);
  
        cmd->user_handle     = (uintptr_t) qp;