refresh

diff --git a/meta b/meta
index 375ada6f840ab41a0e944b10c05ac9f091b92c28..76f0ff32ac8360cfae6c130cce0af263cbea6960 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 9062e96a7b3c44547484faf7c7bdb6273b8ede05
-Head: 1048526e8c3fa04375666687325cc044632c767b
+Previous: e1cb96fdbd7f56882baa468013492d6768ebd96e
+Head: 30ba552a9c381eea00d4554341d06dd5a1f6b922
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
   compat-ex: fb8aa3e0b8ed628564d7d774907fd17a72a23522
   xrcd: 71fa003681345f671bdef05c9548263252e949de
   srq_ex: f22b88dd94854fd3b42fb6a48e7a6962620ddc81
-  xrc_qp: c32fce1465c8f9cec13094280e0d69333600258c
-  refresh-temp: 1048526e8c3fa04375666687325cc044632c767b
+  xrc_qp: 30ba552a9c381eea00d4554341d06dd5a1f6b922
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b0c8431..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-Bottom: 274b821244bd4648ea1872a8fd70996ff9cbfbe7
-Top:    f3713fe115d4b1490474c9615155de2ee6fe77e1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-17 21:21:57 -0700
-
-Refresh of xrc_qp
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index e9f9727..d9f0b7a 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -653,14 +653,14 @@ int ibv_cmd_create_qp_ex(struct ibv_pd *pd,
-               }
-       }
- 
--      cmd->max_send_wr     = attr->cap.max_send_wr;
--      cmd->max_recv_wr     = attr->cap.max_recv_wr;
--      cmd->max_send_sge    = attr->cap.max_send_sge;
--      cmd->max_recv_sge    = attr->cap.max_recv_sge;
--      cmd->max_inline_data = attr->cap.max_inline_data;
--      cmd->sq_sig_all      = attr->sq_sig_all;
--      cmd->qp_type         = attr->qp_type;
--      cmd->is_srq          = !!attr->srq;
-+      cmd->max_send_wr     = attr_ex->cap.max_send_wr;
-+      cmd->max_recv_wr     = attr_ex->cap.max_recv_wr;
-+      cmd->max_send_sge    = attr_ex->cap.max_send_sge;
-+      cmd->max_recv_sge    = attr_ex->cap.max_recv_sge;
-+      cmd->max_inline_data = attr_ex->cap.max_inline_data;
-+      cmd->sq_sig_all      = attr_ex->sq_sig_all;
-+      cmd->qp_type         = attr_ex->qp_type;
-+      cmd->is_srq          = !!attr_ex->srq;
-       cmd->reserved        = 0;
- 
-       if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)

diff --git a/patches/xrc_qp b/patches/xrc_qp
index 5729b29ce992e1547624adb327a86b6caab19a4f..26da503b80f688adb184af2a11e2776fb8d2dc71 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
 Bottom: 11941897032eb87737493328f3f37b7c3a43ee9c
-Top:    274b821244bd4648ea1872a8fd70996ff9cbfbe7
+Top:    f3713fe115d4b1490474c9615155de2ee6fe77e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -162,10 +162,10 @@ index 58d6927..68ea657 100644
   * ibv_modify_qp - Modify a queue pair.
   */
 diff --git a/src/cmd.c b/src/cmd.c
-index 1c4bfb3..e9f9727 100644
+index 1c4bfb3..d9f0b7a 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -628,18 +628,31 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
+@@ -628,36 +628,49 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
        return 0;
  }
  
@@ -187,6 +187,14 @@ index 1c4bfb3..e9f9727 100644
 -      cmd->send_cq_handle  = attr->send_cq->handle;
 -      cmd->recv_cq_handle  = attr->recv_cq->handle;
 -      cmd->srq_handle      = attr->srq ? attr->srq->handle : 0;
+-      cmd->max_send_wr     = attr->cap.max_send_wr;
+-      cmd->max_recv_wr     = attr->cap.max_recv_wr;
+-      cmd->max_send_sge    = attr->cap.max_send_sge;
+-      cmd->max_recv_sge    = attr->cap.max_recv_sge;
+-      cmd->max_inline_data = attr->cap.max_inline_data;
+-      cmd->sq_sig_all      = attr->sq_sig_all;
+-      cmd->qp_type         = attr->qp_type;
+-      cmd->is_srq          = !!attr->srq;
 +
 +      if (attr_ex->comp_mask & IBV_QP_INIT_ATTR_XRCD) {
 +              context         = attr_ex->xrcd->context;
@@ -202,11 +210,14 @@ index 1c4bfb3..e9f9727 100644
 +              }
 +      }
 +
-       cmd->max_send_wr     = attr->cap.max_send_wr;
-       cmd->max_recv_wr     = attr->cap.max_recv_wr;
-       cmd->max_send_sge    = attr->cap.max_send_sge;
-@@ -650,14 +663,14 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
-       cmd->is_srq          = !!attr->srq;
++      cmd->max_send_wr     = attr_ex->cap.max_send_wr;
++      cmd->max_recv_wr     = attr_ex->cap.max_recv_wr;
++      cmd->max_send_sge    = attr_ex->cap.max_send_sge;
++      cmd->max_recv_sge    = attr_ex->cap.max_recv_sge;
++      cmd->max_inline_data = attr_ex->cap.max_inline_data;
++      cmd->sq_sig_all      = attr_ex->sq_sig_all;
++      cmd->qp_type         = attr_ex->qp_type;
++      cmd->is_srq          = !!attr_ex->srq;
        cmd->reserved        = 0;
  
 -      if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size)