refresh

diff --git a/meta b/meta
index 373792bad16b3aa0aee03d73d03ebb11f9a7748d..e4de7757929ff28fe2dc03a642a102fdb7ae0d27 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: a7a0fc9ae270f6e96b9be5179adc305e60ec8094
-Head: 9723d5b8310b04f63503b8337959c9a271896403
+Previous: 4a2b63cd6147acea9a6511be09688cbfbe4813ba
+Head: db16fcc9e1123194fd5bdd0f8a2aeee8fb4431f4
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-qpsize: 742f75282720fc80c028108daba43b3680d72d52
   rs-opts: b8f05919dd1522e7298c6e94ea100671c4fb2f17
   rs-opt-qpsize: d2e681f3bf440d01d526262c53504ef6d4758539
-  rs-opt-inline: dd5e6200bb5b9f079d1da3448b0393de1b2793c7
-  refresh-temp: 9723d5b8310b04f63503b8337959c9a271896403
+  rs-opt-inline: db16fcc9e1123194fd5bdd0f8a2aeee8fb4431f4
 Unapplied:
   pre-qpsize: 303e034f4780ecfe41e8363bbba66fcae0837dd0
   rstream-bufsize: 388f3bd699ec0d761a5c1bbf0ee0a1b1d4dff3d2

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e8d78fe..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 20d0bff459590313535e98a0130a647140ecec97
-Top:    91bc251274c1981812043d3cd8e2e72a431611d3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-25 12:28:44 -0700
-
-Refresh of rs-opt-inline
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 7802ef5..5845ca9 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -105,7 +105,7 @@ struct rs_sge {
-       uint32_t length;
- };
- 
--#define RS_INLINE_MIN    (sizeof(struct rs_sge))
-+#define RS_MIN_INLINE    (sizeof(struct rs_sge))
- #define rs_host_is_net() (1 == htonl(1))
- #define RS_CONN_FLAG_NET 1
- 
-@@ -1716,8 +1716,8 @@ int rsetsockopt(int socket, int level, int optname,
-                       break;
-               case RDMA_INLINE:
-                       rs->sq_inline = min(*(uint32_t *) optval, RS_QP_MAX_SIZE);
--                      if (rs->sq_inline < RS_INLINE_MIN)
--                              rs->sq_inline = RS_INLINE_MIN;
-+                      if (rs->sq_inline < RS_MIN_INLINE)
-+                              rs->sq_inline = RS_MIN_INLINE;
-                       break;
-               default:
-                       break;

diff --git a/patches/rs-opt-inline b/patches/rs-opt-inline
index 1445575ef0e8718266950cb4dea9797e72e57074..7f90261c80eadaddec51767b4ea0d074ca4a7543 100644 (file)
--- a/patches/rs-opt-inline
+++ b/patches/rs-opt-inline
@@ -1,5 +1,5 @@
 Bottom: 16a8e9dc8e491e8a1acc2dd1277c10368616ae9b
-Top:    20d0bff459590313535e98a0130a647140ecec97
+Top:    91bc251274c1981812043d3cd8e2e72a431611d3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-22 11:39:21 -0700
 
@@ -29,14 +29,14 @@ index 9fd9929..65feda9 100644
  
  int rsetsockopt(int socket, int level, int optname,
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 9c90d18..7802ef5 100644
+index 9c90d18..5845ca9 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -105,6 +105,7 @@ struct rs_sge {
        uint32_t length;
  };
  
-+#define RS_INLINE_MIN    (sizeof(struct rs_sge))
++#define RS_MIN_INLINE    (sizeof(struct rs_sge))
  #define rs_host_is_net() (1 == htonl(1))
  #define RS_CONN_FLAG_NET 1
  
@@ -104,8 +104,8 @@ index 9c90d18..7802ef5 100644
                        break;
 +              case RDMA_INLINE:
 +                      rs->sq_inline = min(*(uint32_t *) optval, RS_QP_MAX_SIZE);
-+                      if (rs->sq_inline < RS_INLINE_MIN)
-+                              rs->sq_inline = RS_INLINE_MIN;
++                      if (rs->sq_inline < RS_MIN_INLINE)
++                              rs->sq_inline = RS_MIN_INLINE;
 +                      break;
                default:
                        break;