From e396385b0e6d43ec8282376f1278ece9a48dcb31 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Sun, 27 May 2012 14:48:11 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 22 ---------------------- patches/rs-opt-qpsize | 6 +++--- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index e847e586..6ee956c3 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: b28ab3c403ebff6c186d67860a93199a0c186472 -Head: 760d0d8c35c5c776093ca3d49c3f6733b7889255 +Previous: ac6b1053816deed370dc1f8341d34e3497a6b829 +Head: 624840f02ef94f140cdfae9d97c1d0235e4780d2 Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325 rs-qpsize: 742f75282720fc80c028108daba43b3680d72d52 rs-opts: b8f05919dd1522e7298c6e94ea100671c4fb2f17 - rs-opt-qpsize: d2e681f3bf440d01d526262c53504ef6d4758539 - refresh-temp: 760d0d8c35c5c776093ca3d49c3f6733b7889255 + rs-opt-qpsize: 624840f02ef94f140cdfae9d97c1d0235e4780d2 Unapplied: rs-opt-inline: db16fcc9e1123194fd5bdd0f8a2aeee8fb4431f4 pre-qpsize: d7843299f9dfa0fd1311ad88722dd26a8c62a926 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 30a52f39..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: 16a8e9dc8e491e8a1acc2dd1277c10368616ae9b -Top: 802cf3a8498258b521ee1e4f058de10033261d48 -Author: Sean Hefty -Date: 2012-05-27 14:48:10 -0700 - -Refresh of rs-opt-qpsize - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 9c90d18..78d7338 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -1698,7 +1698,7 @@ int rsetsockopt(int socket, int level, int optname, - } - break; - case SOL_RDMA: -- if (rs->state != rs_init && rs->state != rs_bound) { -+ if (rs->state > rs_listening) { - ret = ERR(EINVAL); - break; - } diff --git a/patches/rs-opt-qpsize b/patches/rs-opt-qpsize index 31abdefc..ce60e5e1 100644 --- a/patches/rs-opt-qpsize +++ b/patches/rs-opt-qpsize @@ -1,5 +1,5 @@ Bottom: 25d50cd3051d3f2dd1864415bb489d3f72afdb61 -Top: 16a8e9dc8e491e8a1acc2dd1277c10368616ae9b +Top: 802cf3a8498258b521ee1e4f058de10033261d48 Author: Sean Hefty Date: 2012-05-18 16:56:15 -0700 @@ -49,7 +49,7 @@ index f28eaf3..2f5215c 100644 /* diff --git a/src/rsocket.c b/src/rsocket.c -index 15e28de..9c90d18 100644 +index 15e28de..78d7338 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -265,8 +265,15 @@ static void rs_set_qp_size(struct rsocket *rs) @@ -72,7 +72,7 @@ index 15e28de..9c90d18 100644 } break; case SOL_RDMA: -+ if (rs->state != rs_init && rs->state != rs_bound) { ++ if (rs->state > rs_listening) { + ret = ERR(EINVAL); + break; + } -- 2.41.0