refresh

diff --git a/meta b/meta
index 0d68406a5b2ad7e5507d096689b3e44b100fc413..6b74c1b6d304473c3c85ed8cdab8593bd855f1ba 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 8c32768a70e1f441b73c95baa3eb11e3ff1d3ea0
-Head: 73f250ca2c96e3677130ada9b36720ca985ee58a
+Previous: 471b6be023be380ccc4021c6d469bdeedc393e91
+Head: 9698473fabcdee089e866558fb1bfc9dbc867609
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
-  srq_ex: 4a296a08851356d367668a71cb852480dc7f909b
-  refresh-temp: 73f250ca2c96e3677130ada9b36720ca985ee58a
+  srq_ex: 9698473fabcdee089e866558fb1bfc9dbc867609
 Unapplied:
   xrc_qp: 4a0576055696439df90cb88f5f895b9628edf1bf
   compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7ae6408..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: eb069dacc3502ba7f9e575f462e80f48ec5b8fd4
-Top:    992bac9a3e4b537be435ba172596c0147b3170ef
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-26 12:05:44 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index e03676d..c3c6f53 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -521,7 +521,7 @@ int ibv_cmd_create_srq_ex(struct ibv_pd *pd,
-       pthread_mutex_init(&srq->srq.mutex, NULL);
-       pthread_cond_init(&srq->srq.cond, NULL);
- 
--      srq->comp_mask |= IBV_SRQ_INIT_ATTR_TYPE;
-+      srq->comp_mask = IBV_SRQ_INIT_ATTR_TYPE;
-       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) {

diff --git a/patches/srq_ex b/patches/srq_ex
index 9723a3f203694e4eb4121f21d976d4091fdb620a..401621d55f89590464524019e6ac2659d8afc59e 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: d61609a08e9982129877f09abe125a8fb4ebe771
-Top:    eb069dacc3502ba7f9e575f462e80f48ec5b8fd4
+Top:    992bac9a3e4b537be435ba172596c0147b3170ef
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -209,7 +209,7 @@ index 08750e7..e67bf21 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..e03676d 100644
+index e6caf5b..c3c6f53 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -481,6 +481,69 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
@@ -256,7 +256,7 @@ index e6caf5b..e03676d 100644
 +      pthread_mutex_init(&srq->srq.mutex, NULL);
 +      pthread_cond_init(&srq->srq.cond, NULL);
 +
-+      srq->comp_mask |= IBV_SRQ_INIT_ATTR_TYPE;
++      srq->comp_mask = IBV_SRQ_INIT_ATTR_TYPE;
 +      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) {