refresh

diff --git a/meta b/meta
index a3c6e263854c062a7142717917a1356ec70aec67..d96bd26002205341fbc7defc690a42a0239e7681 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 173c04e233f59dfbcc7ecbff99400ffa720da85a
-Head: 8633e2a863333aaf8886a06a0367c009f68b8876
+Previous: 4f15fb505617a04fa4b5fb1659a8754fa03a6382
+Head: 40a85adc2c499b0fbece7ca79fb06dd97b2b6782
 Applied:
   lazy-init: f306625fe8cafef70e3d60fddd7e685bc0696047
   rs-inline: de52ebed743b5b7ef300586b4f7cb875dfd77792
-  rs-ctrl: c8bc6b60eb6b12f1c7c1ee7a8636d38eaa866b8b
-  refresh-temp: 8633e2a863333aaf8886a06a0367c009f68b8876
+  rs-ctrl: 40a85adc2c499b0fbece7ca79fb06dd97b2b6782
 Unapplied:
   inline0: f187212a28d15ba2fed172e2428c4fb777cf8a09
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3238459..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 4c69a188a96268f07c5d7461565f8d0bf08ae799
-Top:    a4b027aa49511f9b25d3ae96dfdd17cf88185db2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-04-16 23:55:13 -0700
-
-Refresh of rs-ctrl
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 3af60c4..3f9fe49 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -862,7 +862,7 @@ static int rs_create_ep(struct rsocket *rs)
-       if (ret)
-               return ret;
- 
--      rs->sq_inline = qp_attr->cap.max_inline_size;
-+      rs->sq_inline = qp_attr.cap.max_inline_size;
-       if (rs->sq_inline < RS_MIN_INLINE)
-               return ERR(EINVAL);

diff --git a/patches/rs-ctrl b/patches/rs-ctrl
index 6444c5a7326b88da7264da005ceaaaf3c8e678ce..9902d456d812a5c5c7bb8a0102dcc1301a56c884 100644 (file)
--- a/patches/rs-ctrl
+++ b/patches/rs-ctrl
@@ -1,5 +1,5 @@
 Bottom: 55ffa8849cf2c6e18856f1e9d278573786bcb7f0
-Top:    4c69a188a96268f07c5d7461565f8d0bf08ae799
+Top:    a4b027aa49511f9b25d3ae96dfdd17cf88185db2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-04-16 22:33:38 -0700
 
@@ -35,7 +35,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 8325edf..3af60c4 100644
+index 8325edf..3f9fe49 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -307,7 +307,8 @@ struct rsocket {
@@ -92,6 +92,15 @@ index 8325edf..3af60c4 100644
        rs->rseq_comp = rs->rq_size >> 1;
        return 0;
  }
+@@ -860,7 +862,7 @@ static int rs_create_ep(struct rsocket *rs)
+       if (ret)
+               return ret;
+ 
+-      rs->sq_inline = qp_attr->cap.max_inline_size;
++      rs->sq_inline = qp_attr.cap.max_inline_size;
+       if (rs->sq_inline < RS_MIN_INLINE)
+               return ERR(EINVAL);
+ 
 @@ -1787,11 +1789,11 @@ static void rs_send_credits(struct rsocket *rs)
        struct ibv_sge ibsge;
        struct rs_sge sge;