From d3798b92803b3b6921123d48f8f3166ea022b5e2 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 25 May 2012 12:29:05 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/rs-def-inline | 24 ++---------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/meta b/meta index f610548c..4941d0e6 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: de717d2007041eb761c784d283ee0331f29c8040 -Head: 875e0301583d4cdeda4ad3d70c5b7d775a07145a +Previous: 3fa411c2b4b758019d37d9de6605a98b02b1bf9e +Head: 307800c8b15c71fb10a1a5ddb771d1f8e1bf82e1 Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325 @@ -12,8 +12,8 @@ Applied: rstream-bufsize: ed655ae0aaaaabfef0acff80d23f012a37fabe80 rs-def-qpsize: d119ebf6e28baed1c72d09f2044bb19317783755 rs-1sge: 875e0301583d4cdeda4ad3d70c5b7d775a07145a + rs-def-inline: 307800c8b15c71fb10a1a5ddb771d1f8e1bf82e1 Unapplied: - rs-def-inline: a933c88453178028a6cc062cd7185d25f1fad123 acm-sock: 490c1722368029e575cc4c5b7cc3287423287ef6 rs-with-acm: b36680fafcd7d075cbb618c300f0c781db1db2f3 Hidden: diff --git a/patches/rs-def-inline b/patches/rs-def-inline index ebe3f70f..d937003b 100644 --- a/patches/rs-def-inline +++ b/patches/rs-def-inline @@ -1,4 +1,4 @@ -Bottom: caec06cc45592384f2a93faf3ca4f4571b1481ff +Bottom: d9f71663831d923b2f7d378703d0d3d42669945e Top: b29b6a4c9e9f9d59b1bcb41088f14c174140e586 Author: Sean Hefty Date: 2012-05-24 18:18:43 -0700 @@ -26,7 +26,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index 6bc02f7..5eec5d9 100644 +index 378afd7..5eec5d9 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -51,7 +51,6 @@ @@ -37,15 +37,6 @@ index 6bc02f7..5eec5d9 100644 #define RS_OLAP_START_SIZE 2048 #define RS_MAX_TRANSFER 65536 #define RS_QP_SIZE 384 -@@ -109,7 +108,7 @@ struct rs_sge { - uint32_t length; - }; - --#define RS_INLINE_MIN (sizeof(struct rs_sge)) -+#define RS_MIN_INLINE (sizeof(struct rs_sge)) - #define rs_host_is_net() (1 == htonl(1)) - #define RS_CONN_FLAG_NET 1 - @@ -223,7 +222,7 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs) rs->ctrl_avail = inherited_rs->ctrl_avail; } else { @@ -55,14 +46,3 @@ index 6bc02f7..5eec5d9 100644 rs->sq_size = rs->rq_size = RS_QP_SIZE; rs->ctrl_avail = RS_QP_CTRL_SIZE; } -@@ -1676,8 +1675,8 @@ int rsetsockopt(int socket, int level, int optname, - break; - case RDMA_INLINE: - rs->sq_inline = min(*(uint32_t *) optval, RS_QP_MAX_SIZE); -- if (rs->sq_inline < RS_INLINE_MIN) -- rs->sq_inline = RS_INLINE_MIN; -+ if (rs->sq_inline < RS_MIN_INLINE) -+ rs->sq_inline = RS_MIN_INLINE; - break; - default: - break; -- 2.41.0