refresh

diff --git a/meta b/meta
index 3e53de695cdb6128cafd07815e18785f67891f5b..bab3399a61099e4e1dbdc3a7423178477ee2d3ef 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 03dcb90498c4d6f02852e09103cfef3cee4315c4
-Head: 80c4606cc5bc9b6dbba485715e5a888e8e5e6421
+Previous: 589ec02e26a5cc396bcf914359cb2605cf709d66
+Head: d7f21c0d63daf2cabdf9175d0d27628c132f5b57
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -18,7 +18,6 @@ Applied:
   pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e
   rs-states: 8b381e3287431e07386e4117098c3d538cb7731e
   rs-recv-hang: 6b48a1e8e4f5f3012a3c0620bbf3e19d08d60692
-  rstream-conn: cb69d1b7874b5c75e4a254156f4e4e5f6e336c14
-  refresh-temp: 80c4606cc5bc9b6dbba485715e5a888e8e5e6421
+  rstream-conn: d7f21c0d63daf2cabdf9175d0d27628c132f5b57
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4c42a28..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: 030d1e2873e6a83256b30cc08db81505fba45366
-Top:    b5c2a779072ac43912983f2422c7c3e5bea7f396
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 16:31:09 -0700
-
-Refresh of rstream-conn
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 4ecd2ce..428b273 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -317,11 +317,11 @@ static int sync_test(void)
- {
-       int ret;
- 
--      ret = dst_addr ? send_xfer(rs, 4) : recv_xfer(rs, 4);
-+      ret = dst_addr ? send_xfer(4) : recv_xfer(4);
-       if (ret)
-               return ret;
- 
--      return dst_addr ? recv_xfer(rs, 4) : send_xfer(rs, 4);
-+      return dst_addr ? recv_xfer(4) : send_xfer(4);
- }
- 
- static int run_test(void)

diff --git a/patches/rstream-conn b/patches/rstream-conn
index 4ad8c003ff986a012ceb5ea746d434b403a62c66..a384475182aad07114eaa983fc1a0938d43f6761 100644 (file)
--- a/patches/rstream-conn
+++ b/patches/rstream-conn
@@ -1,5 +1,5 @@
 Bottom: c3b90ff21e5e632593f3673fbd16a7837412dc67
-Top:    030d1e2873e6a83256b30cc08db81505fba45366
+Top:    b5c2a779072ac43912983f2422c7c3e5bea7f396
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-27 14:07:42 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 7fa537e..4ecd2ce 100644
+index 7fa537e..428b273 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -71,12 +71,20 @@ static struct test_size_param test_size[] = {
@@ -56,7 +56,7 @@ index 7fa537e..4ecd2ce 100644
  {
        struct pollfd fds;
        int offset, ret;
-@@ -305,7 +313,7 @@ static int recv_xfer(int rs, int size)
+@@ -305,37 +313,37 @@ static int recv_xfer(int rs, int size)
        return 0;
  }
  
@@ -65,8 +65,13 @@ index 7fa537e..4ecd2ce 100644
  {
        int ret;
  
-@@ -316,26 +324,26 @@ static int sync_test(int rs)
-       return dst_addr ? recv_xfer(rs, 4) : send_xfer(rs, 4);
+-      ret = dst_addr ? send_xfer(rs, 4) : recv_xfer(rs, 4);
++      ret = dst_addr ? send_xfer(4) : recv_xfer(4);
+       if (ret)
+               return ret;
+ 
+-      return dst_addr ? recv_xfer(rs, 4) : send_xfer(rs, 4);
++      return dst_addr ? recv_xfer(4) : send_xfer(4);
  }
  
 -static int run_test(int rs)