From 6043454844ef0bb1b090cc4d8e9f0c1b38097aec Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 21 May 2012 17:52:20 -0700 Subject: [PATCH] refresh --- meta | 7 +++--- patches/refresh-temp | 55 ------------------------------------------- patches/rs-opt-qpsize | 48 ++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 60 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d75df7ff..87bc4a41 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: f1ea6988634c6ac04914be3fa23bc1f692338f64 -Head: 5d2a7f0a397c6abdfcf58a14d1a502067c79cf37 +Previous: 22d27667bf5095b4aa02b7ba396308687dbf5c37 +Head: 74be234292f1d1cdafe4708c70f5664df9a43d3e Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325 rs-qpsize: 7f07a14cb3e0818d116b847a436725cf7386c019 rs-opts: f740a919d0a8db62f7ade2abd5a2ae2c30cae5da - rs-opt-qpsize: 38ec8e0c144bf785657c7ee2279d7d099587a361 - refresh-temp: 5d2a7f0a397c6abdfcf58a14d1a502067c79cf37 + rs-opt-qpsize: 74be234292f1d1cdafe4708c70f5664df9a43d3e Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 6f0c1344..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,55 +0,0 @@ -Bottom: 01e3c2c0f37572e9555ececfa38d5f92a80627fb -Top: 7789841c5305f1e6ee8dd914ee3e43bfffbb7ba3 -Author: Sean Hefty -Date: 2012-05-21 17:52:20 -0700 - -Refresh of rs-opt-qpsize - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 9d373b9..893cc57 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -1695,6 +1695,20 @@ int rsetsockopt(int socket, int level, int optname, - } - break; - case SOL_RDMA: -+ if (rs->state != rs_init && rs->state != rs_bound) { -+ -+ switch (optname) { -+ case RDMA_SQSIZE: -+ *((int *) optval) = rs->sq_size; -+ *optlen = sizeof(int); -+ break; -+ case RDMA_RQSIZE: -+ *((int *) optval) = rs->rq_size; -+ *optlen = sizeof(int); -+ break; -+ default: -+ break; -+ } - break; - default: - break; -@@ -1762,7 +1776,19 @@ int rgetsockopt(int socket, int level, int optname, - } - break; - case SOL_RDMA: -- ret = ENOTSUP; -+ switch (optname) { -+ case RDMA_SQSIZE: -+ *((int *) optval) = rs->sq_size; -+ *optlen = sizeof(int); -+ break; -+ case RDMA_RQSIZE: -+ *((int *) optval) = rs->rq_size; -+ *optlen = sizeof(int); -+ break; -+ default: -+ ret = ENOTSUP; -+ break; -+ } - break; - default: - ret = ENOTSUP; diff --git a/patches/rs-opt-qpsize b/patches/rs-opt-qpsize index 1aa48572..31d27da3 100644 --- a/patches/rs-opt-qpsize +++ b/patches/rs-opt-qpsize @@ -1,5 +1,5 @@ Bottom: a56e016c539a26a00f6719ca5ac0b7574ce02b22 -Top: 01e3c2c0f37572e9555ececfa38d5f92a80627fb +Top: 7789841c5305f1e6ee8dd914ee3e43bfffbb7ba3 Author: Sean Hefty Date: 2012-05-18 16:56:15 -0700 @@ -36,3 +36,49 @@ index 87ee943..9fd9929 100644 int rsetsockopt(int socket, int level, int optname, const void *optval, socklen_t optlen); +diff --git a/src/rsocket.c b/src/rsocket.c +index 9d373b9..893cc57 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -1695,6 +1695,20 @@ int rsetsockopt(int socket, int level, int optname, + } + break; + case SOL_RDMA: ++ if (rs->state != rs_init && rs->state != rs_bound) { ++ ++ switch (optname) { ++ case RDMA_SQSIZE: ++ *((int *) optval) = rs->sq_size; ++ *optlen = sizeof(int); ++ break; ++ case RDMA_RQSIZE: ++ *((int *) optval) = rs->rq_size; ++ *optlen = sizeof(int); ++ break; ++ default: ++ break; ++ } + break; + default: + break; +@@ -1762,7 +1776,19 @@ int rgetsockopt(int socket, int level, int optname, + } + break; + case SOL_RDMA: +- ret = ENOTSUP; ++ switch (optname) { ++ case RDMA_SQSIZE: ++ *((int *) optval) = rs->sq_size; ++ *optlen = sizeof(int); ++ break; ++ case RDMA_RQSIZE: ++ *((int *) optval) = rs->rq_size; ++ *optlen = sizeof(int); ++ break; ++ default: ++ ret = ENOTSUP; ++ break; ++ } + break; + default: + ret = ENOTSUP; -- 2.41.0