refresh

diff --git a/meta b/meta
index c9e6775abcafdc9aae621ce6bee68105de328a15..df88965c9fad9a6150f48f4e74a3d9736bba9dee 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c1e2db1577d19252292af498bd69c4fbeab4cc88
-Head: 8c21800f5c7db8a359b10483a43ae00d3f3f0f42
+Previous: b780ad8409179e602231a057b1dca1e53fd194f2
+Head: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7
 Applied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
-  rs-opt-qpsize: 014d73d3406368b0c7d90e2a5a1dac5c517badca
-  refresh-temp: 8c21800f5c7db8a359b10483a43ae00d3f3f0f42
+  rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 81471c7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 232a5020b2d128a616b93f4b14bc5a527a330b7c
-Top:    e6975e492692c72dbfebbebe4c6165f5a6f594a9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-18 16:58:28 -0700
-
-Refresh of rs-opt-qpsize
-
----
-
-diff --git a/include/rdma/rsocket.h b/include/rdma/rsocket.h
-index 87ee943..9fd9929 100644
---- a/include/rdma/rsocket.h
-+++ b/include/rdma/rsocket.h
-@@ -73,6 +73,10 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen);
- int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen);
- 
- #define SOL_RDMA 0x10000
-+enum {
-+      RDMA_SQSIZE,
-+      RDMA_RQSIZE
-+};
- 
- int rsetsockopt(int socket, int level, int optname,
-               const void *optval, socklen_t optlen);

diff --git a/patches/rs-opt-qpsize b/patches/rs-opt-qpsize
index 558417541e66a60ae55a5f5c60b84f208db87fe1..e9c80ca4aea2d79107da8bd253c5efb4dd25b862 100644 (file)
--- a/patches/rs-opt-qpsize
+++ b/patches/rs-opt-qpsize
@@ -1,22 +1,38 @@
 Bottom: 232a5020b2d128a616b93f4b14bc5a527a330b7c
-Top:    232a5020b2d128a616b93f4b14bc5a527a330b7c
+Top:    e6975e492692c72dbfebbebe4c6165f5a6f594a9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:56:15 -0700
 
-rsockets: Allow user to specify the QP size
+rsockets: Allow user to specify the QP sizes
 
-Add a setsockopt that allows the user to specify the desired
-size of the underlying QP.  The provided size is used as the
-maximum size when creating the QP.  The actual size of the QP
-is the smaller of the user provided maximum and the maximum
-size supported by the underlying hardware.
+Add setsockopt options that allow the user to specify the desired
+size of the underlying QP.  The provided sizes are used as the
+maximum size when creating the QP.  The actual sizes of the QP
+are the smaller of the user provided maximum and the maximum
+sizes supported by the underlying hardware.
 
-A user may retrieve the actual size of the QP through the
+A user may retrieve the actual sizes of the QP through the
 getsockopt call.
 
+The send and receive queue sizes are specified separately.
+
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---
 
-
+diff --git a/include/rdma/rsocket.h b/include/rdma/rsocket.h
+index 87ee943..9fd9929 100644
+--- a/include/rdma/rsocket.h
++++ b/include/rdma/rsocket.h
+@@ -73,6 +73,10 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen);
+ int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen);
+ 
+ #define SOL_RDMA 0x10000
++enum {
++      RDMA_SQSIZE,
++      RDMA_RQSIZE
++};
+ 
+ int rsetsockopt(int socket, int level, int optname,
+               const void *optval, socklen_t optlen);