refresh

diff --git a/meta b/meta
index 53a0d09609ed8e298dc16d69c8bc64adcc147fe4..4daec7355908b927dcb82fdd8748920923c03a8f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 22b32ac6ef21396238430e742cebbdef5b66ed96
-Head: 8474bbe8e9dfb76dd905578ae5dea4a36af7e3d5
+Previous: 1b2e93d799c2e569ba9a0e93c58aa70e993ca613
+Head: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
 Applied:
-  rs-opts: 9b8dce35b0240c42e8425e389d65635e1a5a4f52
-  refresh-temp: 8474bbe8e9dfb76dd905578ae5dea4a36af7e3d5
+  rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f131200..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,45 +0,0 @@
-Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    232a5020b2d128a616b93f4b14bc5a527a330b7c
-Author: Sean Hefty <sean.hefty@intel.com>
-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;

diff --git a/patches/rs-opts b/patches/rs-opts
index c7743dffc5fe0d0bfdf562d0d2f024fa48ab9b54..c64b43136a63e0fe41c2b89cf75b406cd536fc11 100644 (file)
--- a/patches/rs-opts
+++ b/patches/rs-opts
@@ -1,5 +1,5 @@
 Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
+Top:    232a5020b2d128a616b93f4b14bc5a527a330b7c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:36:07 -0700
 
@@ -17,4 +17,39 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+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;