refresh

diff --git a/meta b/meta
index d02a31cd238a9d33adec8971933bba917ad286bb..4b28c2f4499b9a06e6bee3a4e1ef518f8a66a1d7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 7f295d0139b48fe4683cee98797cc49b3ba08350
-Head: 94c0bc887218679831d761f54a9d04903f56a85a
+Previous: 2ae914ab0a8bff6b81a9af025aeed05893a9e18c
+Head: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
 Applied:
-  destroy_cqs: a3796c012704c7f02811c49538d65dc24c2d1cb3
-  refresh-temp: 94c0bc887218679831d761f54a9d04903f56a85a
+  destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
 Unapplied:
   rs-qpsize: adee5db68a8f004ef5a94dc0cad94b74bf685088
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4

diff --git a/patches/destroy_cqs b/patches/destroy_cqs
index 351d97b9b4712d6e423c085b59210d04dc8eae90..7b9c56537c8b4a6be3333e976218db32ee493e51 100644 (file)
--- a/patches/destroy_cqs
+++ b/patches/destroy_cqs
@@ -1,5 +1,5 @@
 Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    84dde5925d2ae4b35a6fc92a878e89811540430a
+Top:    d551dadf671871078fc6a8314f4015e8e5d6e78a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-20 22:41:38 -0700
 
@@ -34,3 +34,20 @@ index c32803d..9cd34cf 100755
 +      if (id->send_cq_channel && (id->send_cq_channel != id->recv_cq_channel))
                ibv_destroy_comp_channel(id->send_cq_channel);
  }
+ 
+diff --git a/src/rsocket.c b/src/rsocket.c
+index de0ec3e..01b7248 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -366,11 +366,8 @@ static void rs_free(struct rsocket *rs)
+               rdma_dereg_mr(rs->target_mr);
+ 
+       if (rs->cm_id) {
+-              if (rs->cm_id->qp) {
+-                      rs->cm_id->send_cq_channel = NULL;
+-                      rs->cm_id->send_cq = NULL;
++              if (rs->cm_id->qp)
+                       rdma_destroy_qp(rs->cm_id);
+-              }
+               rdma_destroy_id(rs->cm_id);
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1ea4e0c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 84dde5925d2ae4b35a6fc92a878e89811540430a
-Top:    d551dadf671871078fc6a8314f4015e8e5d6e78a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-20 22:44:34 -0700
-
-Refresh of destroy_cqs
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index de0ec3e..01b7248 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -366,11 +366,8 @@ static void rs_free(struct rsocket *rs)
-               rdma_dereg_mr(rs->target_mr);
- 
-       if (rs->cm_id) {
--              if (rs->cm_id->qp) {
--                      rs->cm_id->send_cq_channel = NULL;
--                      rs->cm_id->send_cq = NULL;
-+              if (rs->cm_id->qp)
-                       rdma_destroy_qp(rs->cm_id);
--              }
-               rdma_destroy_id(rs->cm_id);
-       }