commit

diff --git a/meta b/meta
index 3e6d3240a13b5c9212c3dd8e953fc58017b13a42..3573de75eb895b932f8a2ebc26a8aab514955490 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 2d2acee7509c720caf74f9be1f53d41873aa353d
+Previous: 10e6cafedc055da7e724cd1e9cc5a9b122e6ab4f
 Head: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Applied:
-  ucmatose-accept: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec

diff --git a/patches/ucmatose-accept b/patches/ucmatose-accept
deleted file mode 100644 (file)
index 1b0d5f7..0000000
--- a/patches/ucmatose-accept
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: f7d2ba0428817eeaa855ddb332d7f7e51db9326f
-Top:    7a63e115cc4adf073292cd3edca568d9910e1a6e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-04 12:01:50 -0700
-
-ucmatose: Remove connect parameter passed into rdma_accept
-
-Pass in NULL for conn_param into rdma_accept to indicate
-that the passive side will use the values specified by the
-active side.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 9ea6777..2b6b2b1 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -266,7 +266,6 @@ err:
- static int connect_handler(struct rdma_cm_id *cma_id)
- {
-       struct cmatest_node *node;
--      struct rdma_conn_param conn_param;
-       int ret;
- 
-       if (test.conn_index == connections) {
-@@ -286,10 +285,7 @@ static int connect_handler(struct rdma_cm_id *cma_id)
-       if (ret)
-               goto err2;
- 
--      memset(&conn_param, 0, sizeof conn_param);
--      conn_param.responder_resources = 1;
--      conn_param.initiator_depth = 1;
--      ret = rdma_accept(node->cma_id, &conn_param);
-+      ret = rdma_accept(node->cma_id, NULL);
-       if (ret) {
-               perror("cmatose: failure accepting");
-               goto err2;