refresh

diff --git a/meta b/meta
index 6f019dc577f93852113d92f7d3562864ec15ca50..bba41c328265c854402e6054b0aaf3223d68f0da 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 09b450c8417f02a9975b01c9195ccdef014a5580
-Head: 0d42143391f86a2c9a888dbd39de1f5dbdd1d491
+Previous: f046ca1af7bbc3443f13ed8421bc7679a88272a6
+Head: 83c2c70b91d4a93bbdd9bbec501de3a23e77a3bd
 Applied:
-  rst-afib: 6917b7bd04dbb9abdd1bb9787f52863aa3d92b7f
-  refresh-temp: 0d42143391f86a2c9a888dbd39de1f5dbdd1d491
+  rst-afib: 83c2c70b91d4a93bbdd9bbec501de3a23e77a3bd
 Unapplied:
   ex-afib: 5d01e9813050e901f880d4be67738a75e60ed41c
   rs-setroute: 70a6b0b2fce4adbe0ff7d7551074a87d43cac9a2

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 74ab4d2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 7574733bce532f59e4774d9f673cce4b9f5451f9
-Top:    68e89cf1610b4f73ee5afa33d14d24e0ce412529
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-07-26 00:14:22 -0700
-
-Refresh of rst-afib
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 3ff79d8..6339c47 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1194,8 +1194,8 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-       rs_save_conn_data(new_rs, creq);
-       param = new_rs->cm_id->event->param.conn;
-       rs_format_conn_data(new_rs, &cresp);
--      param->private_data = &cresp;
--      param->private_data_len = sizeof cresp;
-+      param.private_data = &cresp;
-+      param.private_data_len = sizeof cresp;
-       ret = rdma_accept(new_rs->cm_id, &param);
-       if (!ret)
-               new_rs->state = rs_connect_rdwr;
-@@ -1264,8 +1264,8 @@ do_connect:
-               memset(&param, 0, sizeof param);
-               creq = (void *) &cdata + rs_conn_data_offset(rs);
-               rs_format_conn_data(rs, creq);
--              param->private_data = (void *) creq - rs_conn_data_offset(rs);
--              param->private_data_len = sizeof(*creq) + rs_conn_data_offset(rs);
-+              param.private_data = (void *) creq - rs_conn_data_offset(rs);
-+              param.private_data_len = sizeof(*creq) + rs_conn_data_offset(rs);
-               param.flow_control = 1;
-               param.retry_count = 7;
-               param.rnr_retry_count = 7;

diff --git a/patches/rst-afib b/patches/rst-afib
index d4770a40b64eedcd095b8fb80b487227de83cb33..a8e4b668ff255a9b88743d3b4a0ed3f3492ecdb3 100644 (file)
--- a/patches/rst-afib
+++ b/patches/rst-afib
@@ -1,5 +1,5 @@
 Bottom: 4389e5ccd819a6d0803f1527aeca1074994ff4ce
-Top:    7574733bce532f59e4774d9f673cce4b9f5451f9
+Top:    68e89cf1610b4f73ee5afa33d14d24e0ce412529
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-07-18 13:26:15 -0700
 
@@ -66,7 +66,7 @@ index e6fba8b..e944a9a 100644
  #define SYSCONFDIR "/etc"
  #endif
 diff --git a/src/rsocket.c b/src/rsocket.c
-index abdd392..3ff79d8 100644
+index abdd392..6339c47 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -187,6 +187,16 @@ struct rs_conn_data {
@@ -137,8 +137,8 @@ index abdd392..3ff79d8 100644
        param = new_rs->cm_id->event->param.conn;
 -      rs_set_conn_data(new_rs, &param, &cresp);
 +      rs_format_conn_data(new_rs, &cresp);
-+      param->private_data = &cresp;
-+      param->private_data_len = sizeof cresp;
++      param.private_data = &cresp;
++      param.private_data_len = sizeof cresp;
        ret = rdma_accept(new_rs->cm_id, &param);
        if (!ret)
                new_rs->state = rs_connect_rdwr;
@@ -159,8 +159,8 @@ index abdd392..3ff79d8 100644
 -              rs_set_conn_data(rs, &param, &creq);
 +              creq = (void *) &cdata + rs_conn_data_offset(rs);
 +              rs_format_conn_data(rs, creq);
-+              param->private_data = (void *) creq - rs_conn_data_offset(rs);
-+              param->private_data_len = sizeof(*creq) + rs_conn_data_offset(rs);
++              param.private_data = (void *) creq - rs_conn_data_offset(rs);
++              param.private_data_len = sizeof(*creq) + rs_conn_data_offset(rs);
                param.flow_control = 1;
                param.retry_count = 7;
                param.rnr_retry_count = 7;