refresh

diff --git a/meta b/meta
index 6996b06f21bc9c2f7ac49256b4310b2a13e783b5..972366381ce1823e412750e3cb0ab5342bc44be3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b78a7ed377312f88880b64a212847986775deea1
-Head: ea8f918ad8b5c731c4996d74f7afebff7ad96af3
+Previous: f3fa516927a09a9b20a1644382cc070238a5347a
+Head: a3796c012704c7f02811c49538d65dc24c2d1cb3
 Applied:
-  destroy_cqs: 6efa52c79449bcac31414f6682f87f9a30f05bae
-  refresh-temp: ea8f918ad8b5c731c4996d74f7afebff7ad96af3
+  destroy_cqs: a3796c012704c7f02811c49538d65dc24c2d1cb3
 Unapplied:
   rs-qpsize: adee5db68a8f004ef5a94dc0cad94b74bf685088
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4

diff --git a/patches/destroy_cqs b/patches/destroy_cqs
index ce7d0b23f30cc7bc6caeea5c8369dc23ffa20223..351d97b9b4712d6e423c085b59210d04dc8eae90 100644 (file)
--- a/patches/destroy_cqs
+++ b/patches/destroy_cqs
@@ -1,5 +1,5 @@
 Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
+Top:    84dde5925d2ae4b35a6fc92a878e89811540430a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-20 22:41:38 -0700
 
@@ -18,4 +18,19 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index c32803d..9cd34cf 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -1096,10 +1096,10 @@ static void ucma_destroy_cqs(struct rdma_cm_id *id)
+       if (id->recv_cq_channel)
+               ibv_destroy_comp_channel(id->recv_cq_channel);
+ 
+-      if (id->send_cq)
++      if (id->send_cq && (id->send_cq != id->recv_cq))
+               ibv_destroy_cq(id->send_cq);
+ 
+-      if (id->send_cq_channel)
++      if (id->send_cq_channel && (id->send_cq_channel != id->recv_cq_channel))
+               ibv_destroy_comp_channel(id->send_cq_channel);
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index adac5dd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    84dde5925d2ae4b35a6fc92a878e89811540430a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-20 22:42:28 -0700
-
-Refresh of destroy_cqs
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index c32803d..9cd34cf 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -1096,10 +1096,10 @@ static void ucma_destroy_cqs(struct rdma_cm_id *id)
-       if (id->recv_cq_channel)
-               ibv_destroy_comp_channel(id->recv_cq_channel);
- 
--      if (id->send_cq)
-+      if (id->send_cq && (id->send_cq != id->recv_cq))
-               ibv_destroy_cq(id->send_cq);
- 
--      if (id->send_cq_channel)
-+      if (id->send_cq_channel && (id->send_cq_channel != id->recv_cq_channel))
-               ibv_destroy_comp_channel(id->send_cq_channel);
- }