refresh

diff --git a/meta b/meta
index fbe65a75f1c05fdf596cdca355b9d9a5290aab2c..e947486694899c9091b05a251a84f4abe50e3e2a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 9678cfd7f72639c4e8c7f96c81bf2e67ccb5bbb6
-Head: 61a936c24de14bec8fa655ae1ced8d8291c853e7
+Previous: 7d8c4a1930f772a931a8a2c150c4b5ae504f8c29
+Head: 411a7f62adcf39dda8e3866605f66e513b174032
 Applied:
-  resv-rs-len: 9d705522d373954d8813aa172bc25850ce314271
-  refresh-temp: 61a936c24de14bec8fa655ae1ced8d8291c853e7
+  resv-rs-len: 411a7f62adcf39dda8e3866605f66e513b174032
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c54ebe5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    905a8f7c1ba58f27a6fdd44ab3080f3dd73ac6d7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-20 09:27:03 -0700
-
-Refresh of resv-rs-len
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index cc5effe..fc21ce9 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -54,6 +54,7 @@
- #include "indexer.h"
- 
- #define RS_OLAP_START_SIZE 2048
-+/* Data transfers over 64 KB not supported at this time */
- #define RS_MAX_TRANSFER 65536
- #define RS_QP_MAX_SIZE 0xFFFE
- #define RS_QP_CTRL_SIZE 4
-@@ -76,7 +77,11 @@ static uint32_t polling_time = 10;
-  * bit 29: more data, 0 - end of transfer, 1 - more data available
-  *
-  * for data transfers:
-- * bits [28:0]: bytes transfered, 0 = 1 GB
-+ * bits [28:17]: reserved
-+ * bit  [16]: scaling factor for lower 16 bits
-+ *            0 - length is in bytes, total transfer = length bytes
-+ *            1 - length is in 64KB increments, transfer = (length + 1) & 64 KB
-+ * bits [15:0] length of transfered
-  * for control messages:
-  * bits [28-0]: receive credits granted
-  */

diff --git a/patches/resv-rs-len b/patches/resv-rs-len
index 331d280ba5545522e75e14c2b283a35023188db6..08dfd31c18756182bab7fc7da347be8a03559412 100644 (file)
--- a/patches/resv-rs-len
+++ b/patches/resv-rs-len
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    daf53db464152f40dc8d6f2c99844510b03f8567
+Top:    905a8f7c1ba58f27a6fdd44ab3080f3dd73ac6d7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-20 09:19:22 -0700
 
@@ -26,4 +26,28 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index cc5effe..fc21ce9 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -54,6 +54,7 @@
+ #include "indexer.h"
+ 
+ #define RS_OLAP_START_SIZE 2048
++/* Data transfers over 64 KB not supported at this time */
+ #define RS_MAX_TRANSFER 65536
+ #define RS_QP_MAX_SIZE 0xFFFE
+ #define RS_QP_CTRL_SIZE 4
+@@ -76,7 +77,11 @@ static uint32_t polling_time = 10;
+  * bit 29: more data, 0 - end of transfer, 1 - more data available
+  *
+  * for data transfers:
+- * bits [28:0]: bytes transfered, 0 = 1 GB
++ * bits [28:17]: reserved
++ * bit  [16]: scaling factor for lower 16 bits
++ *            0 - length is in bytes, total transfer = length bytes
++ *            1 - length is in 64KB increments, transfer = (length + 1) & 64 KB
++ * bits [15:0] length of transfered
+  * for control messages:
+  * bits [28-0]: receive credits granted
+  */