From 9ef6ca0eaff028edc911ddd161f51c6be5c680dc Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 26 Sep 2012 11:19:31 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++---
 patches/refresh-temp | 51 --------------------------------------------
 patches/srq_ex       | 26 +++++++++++-----------
 3 files changed, 16 insertions(+), 68 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index f7d867e..9ff22e5 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 72bcfcf2b2bdb558d428fe7ea4b454895282f288
-Head: 7ea22c6bfd3b632566593a0ac7f33b617963f539
+Previous: 50e17bcae5d9774493e1ba1c83f9aa964def079f
+Head: 2ce086df2927b3e9732253de35ed2bd3e4c021c5
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
-  srq_ex: 7a346b41aeabbe5cf651fe574231777b10e39180
-  refresh-temp: 7ea22c6bfd3b632566593a0ac7f33b617963f539
+  srq_ex: 2ce086df2927b3e9732253de35ed2bd3e4c021c5
 Unapplied:
   compat-ex: 7cb34472bd00bc286569b726c7d38c6dd0dfe3b0
   xrc_qp: 6c98944a89c8f725d08f68a938954e10c7f09450
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index ee853ef..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: a5f0f26822bf3623757cf999d1b2802ffe0f2bd9
-Top:    784a386f91d98852fe49e15ccf421e6423e8e596
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-26 11:19:31 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index cbdcfdb..68146ad 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -513,26 +513,26 @@ int ibv_cmd_create_srq_ex(struct ibv_pd *pd,
- 
- 	VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
- 
--	srq->handle 	      = resp->srq_handle;
--	srq->context          = pd->context;
--	srq->srq_context      = srq_init_attr_ex->srq_context;
--	srq->pd               = pd;
--	srq->events_completed = 0;
--	pthread_mutex_init(&srq->mutex, NULL);
--	pthread_cond_init(&srq->cond, NULL);
-+	srq->srq.handle 	  = resp->srq_handle;
-+	srq->srq.context          = pd->context;
-+	srq->srq.srq_context      = attr_ex->srq_context;
-+	srq->srq.pd               = pd;
-+	srq->srq.events_completed = 0;
-+	pthread_mutex_init(&srq->srq.mutex, NULL);
-+	pthread_cond_init(&srq->srq.cond, NULL);
- 
- 	srq->comp_mask |= IBV_SRQ_INIT_ATTR_TYPE;
--	srq->srq_type = (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
--			srq_init_attr_ex->srq_type : IBV_SRQT_BASIC;
-+	srq->srq_type = (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
-+			attr_ex->srq_type : IBV_SRQT_BASIC;
- 	if (srq->srq_type == IBV_SRQT_XRC) {
- 		srq->comp_mask |= IBV_SRQ_NUM;
- 		srq->srq_num = resp->srqn;
- 	}
--	if (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
-+	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
- 		srq->comp_mask |= IBV_SRQ_XRCD;
- 		srq->xrcd = vxrcd;
- 	}
--	if (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) {
-+	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) {
- 		srq->comp_mask |= IBV_SRQ_CQ;
- 		srq->cq = srq_init_attr_ex->cq;
- 	}
diff --git a/patches/srq_ex b/patches/srq_ex
index 9faafc8..76895e5 100644
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: d61609a08e9982129877f09abe125a8fb4ebe771
-Top:    a5f0f26822bf3623757cf999d1b2802ffe0f2bd9
+Top:    784a386f91d98852fe49e15ccf421e6423e8e596
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -201,7 +201,7 @@ index 08750e7..c75b239 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..cbdcfdb 100644
+index e6caf5b..68146ad 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -481,6 +481,69 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
@@ -240,26 +240,26 @@ index e6caf5b..cbdcfdb 100644
 +
 +	VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
 +
-+	srq->handle 	      = resp->srq_handle;
-+	srq->context          = pd->context;
-+	srq->srq_context      = srq_init_attr_ex->srq_context;
-+	srq->pd               = pd;
-+	srq->events_completed = 0;
-+	pthread_mutex_init(&srq->mutex, NULL);
-+	pthread_cond_init(&srq->cond, NULL);
++	srq->srq.handle 	  = resp->srq_handle;
++	srq->srq.context          = pd->context;
++	srq->srq.srq_context      = attr_ex->srq_context;
++	srq->srq.pd               = pd;
++	srq->srq.events_completed = 0;
++	pthread_mutex_init(&srq->srq.mutex, NULL);
++	pthread_cond_init(&srq->srq.cond, NULL);
 +
 +	srq->comp_mask |= IBV_SRQ_INIT_ATTR_TYPE;
-+	srq->srq_type = (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
-+			srq_init_attr_ex->srq_type : IBV_SRQT_BASIC;
++	srq->srq_type = (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_TYPE) ?
++			attr_ex->srq_type : IBV_SRQT_BASIC;
 +	if (srq->srq_type == IBV_SRQT_XRC) {
 +		srq->comp_mask |= IBV_SRQ_NUM;
 +		srq->srq_num = resp->srqn;
 +	}
-+	if (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
++	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_XRCD) {
 +		srq->comp_mask |= IBV_SRQ_XRCD;
 +		srq->xrcd = vxrcd;
 +	}
-+	if (srq_init_attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) {
++	if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) {
 +		srq->comp_mask |= IBV_SRQ_CQ;
 +		srq->cq = srq_init_attr_ex->cq;
 +	}
-- 
2.41.0