refresh

diff --git a/meta b/meta
index 9d2bcd68936f711286972f2cf746f5a7bd1534ae..a633cfa590421a5af5940447212ff30712498bb1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 6d950e1dc9fa262c3e60903baf6b7a85b1a2ac5f
-Head: 5c59f617ad5d9d8eb14ecb66d02004b402cbaed5
+Previous: d44cb7034c928fabb5dc6270098813cc81bac0c5
+Head: 6c56dc404c999daa16a039f59b0160ab983acc98
 Applied:
   1-5-librdmacm-rsocket-add-miss: eddbe8f0abc3d0f69755f0e510df2a7f21412c0b
   2-5-librdmacm-rsocket-added-mi: 1f1a03dae14cbb25a43b1b56aa5ae689776edc11
   3-5-librdmacm-rstream-initiali: 41d6547bede80581b384b49bb35eac4fe089d08c
-  4-5-librdmacm-rstream-added-mi: e76e7fe4b608d91552a5c7a59cf9492ac29425af
-  refresh-temp: 5c59f617ad5d9d8eb14ecb66d02004b402cbaed5
+  4-5-librdmacm-rstream-added-mi: 6c56dc404c999daa16a039f59b0160ab983acc98
 Unapplied:
   5-5-librdmacm-rping-added-chec: 62a796f72dbcb7cd08124f4a2b96bef75a803a9a
   acm-port: 4b5c1aa734e0e734fc2ba3cd41d0ddf02170af6d

diff --git a/patches/4-5-librdmacm-rstream-added-mi b/patches/4-5-librdmacm-rstream-added-mi
index f6c9e680d4add01522e75a18f89d0b22cc82b2f9..68bfd532ddc0e2f0f14fc2643076d2f312f1fc84 100644 (file)
--- a/patches/4-5-librdmacm-rstream-added-mi
+++ b/patches/4-5-librdmacm-rstream-added-mi
@@ -1,5 +1,5 @@
 Bottom: 999b4967a7c98b417b409f2d9018478091879091
-Top:    56953b70ed305a979b2ac96939d54e07a2f02e4b
+Top:    04e079ae9012e8656c794388e68818b5bdb4670d
 Author: Dotan Barak <dotanb@dev.mellanox.co.il>
 Date:   2012-10-09 12:27:51 +0000
 
@@ -7,19 +7,22 @@ Date:   2012-10-09 12:27:51 +0000
 
 Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
 Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 6ef60a1..d65c48d 100644
+index 6ef60a1..069b7c9 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
-@@ -464,6 +464,7 @@ static int server_connect(void)
+@@ -462,8 +462,8 @@ static int server_connect(void)
+               rs = rs_accept(lrs, NULL, 0);
+       } while (rs < 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
        if (rs < 0) {
-               ret = rs;
+-              ret = rs;
                perror("raccept");
-+              return ret;
++              return rs;
        }
  
        if (use_fork)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0181113..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 56953b70ed305a979b2ac96939d54e07a2f02e4b
-Top:    04e079ae9012e8656c794388e68818b5bdb4670d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-09 10:00:12 -0700
-
-Refresh of 4-5-librdmacm-rstream-added-mi
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index d65c48d..069b7c9 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -462,9 +462,8 @@ static int server_connect(void)
-               rs = rs_accept(lrs, NULL, 0);
-       } while (rs < 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
-       if (rs < 0) {
--              ret = rs;
-               perror("raccept");
--              return ret;
-+              return rs;
-       }
- 
-       if (use_fork)