refresh

diff --git a/meta b/meta
index 6d3d7d69893dc325aa2637ff5427214ce16c0961..395874f4e16f4955a7981c3eb6567cc4e9b077fa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 69cf38cef62971754cf211695435da1d7e202250
-Head: 10cd077c85047ae4ec9bf6b66b1734544ede695e
+Previous: eaf4c06b53eff8052e80d58331496f38b1e0e630
+Head: 5ed551f9ebc2af74eb2e330b258f0203cbf381e3
 Applied:
-  rping: 0f233c7a0d8a583119488e081e1e09653849aa6c
-  refresh-temp: 10cd077c85047ae4ec9bf6b66b1734544ede695e
+  rping: 5ed551f9ebc2af74eb2e330b258f0203cbf381e3
 Unapplied:
   cont_of: 3c70a581f12975b49cd1aac0236f09c6b8fb9950
   af-ib-conn: 5ce5f56950e0ed453c1798aedfa717bd18a2a754

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3076ac3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: cf9695fcbeea51e0388858a8b307228c9fdaaa42
-Top:    cf9695fcbeea51e0388858a8b307228c9fdaaa42
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-03 15:14:12 -0700
-
-Refresh of rping
-
----
-
-

diff --git a/patches/rping b/patches/rping
index cfdc634529d6f94220e80aaa117dfe198350c77d..b3d4968acc1902e682fcbc906b8220622189858b 100644 (file)
--- a/patches/rping
+++ b/patches/rping
@@ -11,6 +11,11 @@ retry_count is a 3 bit value on IB, reduce it from
 A value of 10 prevents rping from working over the Intel
 IB HCA.  Problem reported by Doug Ledford <dledford@redhat.com>
 
+The retry_count is also not set when calling rdma_accept.
+Rather than passing different values into rdma_accept than
+what was specified by the remote side, use the values given
+in the connection request.
+
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>