From 039f35ded06e581815cb740a4591d741db525381 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 27 Sep 2012 11:29:33 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/refresh-temp | 30 ------------------------------
 patches/srq_ex       | 13 ++++++++-----
 3 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 30a08ee..309b1c7 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 5df21056de8a19a93ba8b629a85ffbb454167600
-Head: c5995a4aceecc4ff5047f27c6386fa2acd3eb341
+Previous: f8aa103783d9b8efe247e22bd502dfc907356534
+Head: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
-  srq_ex: 6f5f3daabb0adbbb0cc82f449b9b220321b945db
-  refresh-temp: c5995a4aceecc4ff5047f27c6386fa2acd3eb341
+  srq_ex: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
 Unapplied:
   xrc_qp: e21c4bf690fe7510747354b4be094b9724f6cf75
   open_qp: 58ba4627a48927caef4724399ef28a0464fe96ba
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 66ff92f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 22e627497c4d3ed923e688a26a726335555baa45
-Top:    bd68ab33c07c691122588fd24837345e7a5c43cc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 11:29:33 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index 1369867..f58e30a 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -505,11 +505,14 @@ int ibv_cmd_create_srq_ex(struct verbs_context *context,
- 	cmd->srq_type = (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
- 			attr_ex->srq_type : IBV_SRQT_BASIC;
- 	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
-+		if (!(attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) ||
-+		    !(attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ))
-+			return EINVAL;
-+
- 		vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd);
- 		cmd->xrcd_handle = vxrcd->handle;
--	}
--	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ)
- 		cmd->cq_handle   = attr_ex->cq->handle;
-+	}
- 
- 	if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size)
- 		return errno;
diff --git a/patches/srq_ex b/patches/srq_ex
index 3ed34c7..62db956 100644
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: d61609a08e9982129877f09abe125a8fb4ebe771
-Top:    22e627497c4d3ed923e688a26a726335555baa45
+Top:    bd68ab33c07c691122588fd24837345e7a5c43cc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -212,10 +212,10 @@ index 08750e7..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 e6caf5b..1369867 100644
+index e6caf5b..f58e30a 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -481,6 +481,72 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
+@@ -481,6 +481,75 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
  	return 0;
  }
  
@@ -243,11 +243,14 @@ index e6caf5b..1369867 100644
 +	cmd->srq_type = (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
 +			attr_ex->srq_type : IBV_SRQT_BASIC;
 +	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
++		if (!(attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) ||
++		    !(attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ))
++			return EINVAL;
++
 +		vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd);
 +		cmd->xrcd_handle = vxrcd->handle;
-+	}
-+	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ)
 +		cmd->cq_handle   = attr_ex->cq->handle;
++	}
 +
 +	if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size)
 +		return errno;
-- 
2.46.0