From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 3 Oct 2012 22:13:27 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8d9304595288698f42f1fc0f692678e50f0cf3b1;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index bebbeedd..e343f90d 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b5440711d90e1a922ed08b680d1c10d5d0765460
-Head: 960881c4a1473e6ae7bb2fb69b6712ba817d2cb7
+Previous: 1226c6fda5b40c52cc78a3578a5a9a928aad5027
+Head: 0f233c7a0d8a583119488e081e1e09653849aa6c
 Applied:
-  rping: da07c3e69841494fbf5749660082a2f8dd48bdf0
-  refresh-temp: 960881c4a1473e6ae7bb2fb69b6712ba817d2cb7
+  rping: 0f233c7a0d8a583119488e081e1e09653849aa6c
 Unapplied:
   cont_of: 3c70a581f12975b49cd1aac0236f09c6b8fb9950
   af-ib-conn: 5ce5f56950e0ed453c1798aedfa717bd18a2a754
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index e27687eb..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: fd25e5104198197967ac10d49db6570c49bf661c
-Top:    cf9695fcbeea51e0388858a8b307228c9fdaaa42
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-03 15:13:26 -0700
-
-Refresh of rping
-
----
-
-diff --git a/examples/rping.c b/examples/rping.c
-index 785338e..32bd70a 100644
---- a/examples/rping.c
-+++ b/examples/rping.c
-@@ -342,16 +342,11 @@ error:
- 
- static int rping_accept(struct rping_cb *cb)
- {
--	struct rdma_conn_param conn_param;
- 	int ret;
- 
- 	DEBUG_LOG("accepting client connection request\n");
- 
--	memset(&conn_param, 0, sizeof conn_param);
--	conn_param.responder_resources = 1;
--	conn_param.initiator_depth = 1;
--
--	ret = rdma_accept(cb->child_cm_id, &conn_param);
-+	ret = rdma_accept(cb->child_cm_id, NULL);
- 	if (ret) {
- 		perror("rdma_accept");
- 		return ret;
-@@ -975,7 +970,7 @@ static int rping_connect_client(struct rping_cb *cb)
- 	memset(&conn_param, 0, sizeof conn_param);
- 	conn_param.responder_resources = 1;
- 	conn_param.initiator_depth = 1;
--	conn_param.retry_count = 10;
-+	conn_param.retry_count = 7;
- 
- 	ret = rdma_connect(cb->cm_id, &conn_param);
- 	if (ret) {
diff --git a/patches/rping b/patches/rping
index e9b68669..cfdc6345 100644
--- a/patches/rping
+++ b/patches/rping
@@ -1,5 +1,5 @@
 Bottom: fd25e5104198197967ac10d49db6570c49bf661c
-Top:    fd25e5104198197967ac10d49db6570c49bf661c
+Top:    cf9695fcbeea51e0388858a8b307228c9fdaaa42
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-03 15:05:20 -0700
 
@@ -16,4 +16,34 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/rping.c b/examples/rping.c
+index 785338e..32bd70a 100644
+--- a/examples/rping.c
++++ b/examples/rping.c
+@@ -342,16 +342,11 @@ error:
+ 
+ static int rping_accept(struct rping_cb *cb)
+ {
+-	struct rdma_conn_param conn_param;
+ 	int ret;
+ 
+ 	DEBUG_LOG("accepting client connection request\n");
+ 
+-	memset(&conn_param, 0, sizeof conn_param);
+-	conn_param.responder_resources = 1;
+-	conn_param.initiator_depth = 1;
+-
+-	ret = rdma_accept(cb->child_cm_id, &conn_param);
++	ret = rdma_accept(cb->child_cm_id, NULL);
+ 	if (ret) {
+ 		perror("rdma_accept");
+ 		return ret;
+@@ -975,7 +970,7 @@ static int rping_connect_client(struct rping_cb *cb)
+ 	memset(&conn_param, 0, sizeof conn_param);
+ 	conn_param.responder_resources = 1;
+ 	conn_param.initiator_depth = 1;
+-	conn_param.retry_count = 10;
++	conn_param.retry_count = 7;
+ 
+ 	ret = rdma_connect(cb->cm_id, &conn_param);
+ 	if (ret) {