From 3d5363f2d698ea047c74bf3c8609ae2c6c36ef4b Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 18 May 2012 16:51:58 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 0035e09a..53a0d096 100644 --- a/meta +++ b/meta @@ -1,7 +1,8 @@ Version: 1 -Previous: 21619280de11e3a2f12d2cbfb3d29a2400c52777 -Head: 9b8dce35b0240c42e8425e389d65635e1a5a4f52 +Previous: 22b32ac6ef21396238430e742cebbdef5b66ed96 +Head: 8474bbe8e9dfb76dd905578ae5dea4a36af7e3d5 Applied: rs-opts: 9b8dce35b0240c42e8425e389d65635e1a5a4f52 + refresh-temp: 8474bbe8e9dfb76dd905578ae5dea4a36af7e3d5 Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..f131200a --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,45 @@ +Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40 +Top: 232a5020b2d128a616b93f4b14bc5a527a330b7c +Author: Sean Hefty +Date: 2012-05-18 16:51:58 -0700 + +Refresh of rs-opts + +--- + +diff --git a/include/rdma/rsocket.h b/include/rdma/rsocket.h +index 5310d33..87ee943 100644 +--- a/include/rdma/rsocket.h ++++ b/include/rdma/rsocket.h +@@ -72,6 +72,8 @@ int rselect(int nfds, fd_set *readfds, fd_set *writefds, + int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen); + int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen); + ++#define SOL_RDMA 0x10000 ++ + int rsetsockopt(int socket, int level, int optname, + const void *optval, socklen_t optlen); + int rgetsockopt(int socket, int level, int optname, +diff --git a/src/rsocket.c b/src/rsocket.c +index de0ec3e..95957d7 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -1661,6 +1661,8 @@ int rsetsockopt(int socket, int level, int optname, + break; + } + break; ++ case SOL_RDMA: ++ break; + default: + break; + } +@@ -1726,6 +1728,9 @@ int rgetsockopt(int socket, int level, int optname, + break; + } + break; ++ case SOL_RDMA: ++ ret = ENOTSUP; ++ break; + default: + ret = ENOTSUP; + break; -- 2.41.0