pop

diff --git a/meta b/meta
index f460f661b4f0e0af951f9872553043de015482fd..32d88c099b75291dff9bd5ef5c4d5ff2e408a683 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 05ddb625360a9e931ea608f734ec8487d148d4fa
-Head: 9fe16d42109fffc021dce5a12e072815d7487b96
+Previous: 655f5c71ebf33beee7ffb94a24b1950fbd250ab0
+Head: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
+  rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
 Unapplied:
-  rs-qpsize: 742f75282720fc80c028108daba43b3680d72d52
   rs-opts: b8f05919dd1522e7298c6e94ea100671c4fb2f17
   rs-opt-qpsize: 624840f02ef94f140cdfae9d97c1d0235e4780d2
   rs-opt-inline: b624fedb7c85a3fa5b4911ebfe56815470248832

diff --git a/patches/rs-qpsize b/patches/rs-qpsize
index 411eb7fc102769b4e6e8e9672b97e05efbe977a6..ce9a53485f3820560f34a0e64416ff5262c8597e 100644 (file)
--- a/patches/rs-qpsize
+++ b/patches/rs-qpsize
@@ -1,5 +1,5 @@
-Bottom: f1dcc179b934b653b4de6f28bbbed627b9fc6acd
-Top:    46615b7edd3b4a8561c0e4419d89bdeb88db2e30
+Bottom: dbe6733eee8ec766ba73d02b7ae6f014b50b846a
+Top:    918eb94303796cba3dd40c4a754a411eb19992a9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 17:07:11 -0700
 
@@ -69,7 +69,7 @@ index 7703fe8..f28eaf3 100644
  static inline int ERR(int err)
  {
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 01b7248..4e0671f 100644
+index 8c96dc1..59cc13c 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -55,6 +55,8 @@
@@ -249,7 +249,7 @@ index 01b7248..4e0671f 100644
                                        rs->rmsg_tail = 0;
                                break;
                        }
-@@ -920,7 +952,7 @@ static int rs_have_rdata(struct rsocket *rs)
+@@ -930,7 +962,7 @@ static int rs_conn_have_rdata(struct rsocket *rs)
  
  static int rs_all_sends_done(struct rsocket *rs)
  {
@@ -258,7 +258,7 @@ index 01b7248..4e0671f 100644
  }
  
  static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
-@@ -937,7 +969,7 @@ static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
+@@ -947,7 +979,7 @@ static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
                        rsize = left;
                } else {
                        rsize = rs->rmsg[rmsg_head].data;
@@ -267,7 +267,7 @@ index 01b7248..4e0671f 100644
                                rmsg_head = 0;
                }
  
-@@ -998,7 +1030,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1008,7 +1040,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                } else {
                        rs->rseq_no++;
                        rsize = rs->rmsg[rs->rmsg_head].data;