refresh (create temporary patch)

diff --git a/meta b/meta
index 9136f4ed314cf7cc8dd6b9e1433fce22e50975a1..0502fbd1f0f7ccb2f8e53f4f99de6de9f065c739 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 9dc990107ed18d94d7d521799f267a2ec8c8304b
-Head: 926b66047387d3c20ecd5f0fa8f4c6b239ca0d13
+Previous: eaca671a6c5f2db76b61cdf592460c0771f53e75
+Head: e264d307852451247e0377d841690b53d02dd5d8
 Applied:
   lazy-init: 23ffef06cf462c4c5ac4ec5880b96c8719b64774
   rs-inline: 926b66047387d3c20ecd5f0fa8f4c6b239ca0d13
+  refresh-temp: e264d307852451247e0377d841690b53d02dd5d8
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..ec52c21
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+Bottom: ee02af812700683098831857a8b518d7b8109c39
+Top:    589161ae78e6cb97402984e81f5f917493d82619
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2014-04-16 21:49:23 -0700
+
+Refresh of rs-inline
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 30ea55d..8325edf 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -860,6 +860,10 @@ static int rs_create_ep(struct rsocket *rs)
+       if (ret)
+               return ret;
+ 
++      rs->sq_inline = qp_attr->cap.max_inline_size;
++      if (rs->sq_inline < RS_MIN_INLINE)
++              return ERR(EINVAL);
++
+       for (i = 0; i < rs->rq_size; i++) {
+               ret = rs_post_recv(rs);
+               if (ret)
+@@ -1491,6 +1495,12 @@ static int ds_create_qp(struct rsocket *rs, union socket_addr *src_addr,
+       if (ret)
+               goto err;
+ 
++      rs->sq_inline = qp_attr.cap.max_inline_data;
++      if (rs->sq_inline < RS_MIN_INLINE) {
++              ret = ERR(ENOMEM);
++              goto err;
++      }
++
+       ret = ds_add_qp_dest(qp, src_addr, addrlen);
+       if (ret)
+               goto err;