refresh

diff --git a/meta b/meta
index 42d8ea14f234b6f8a8d1fb57753866813e7f8485..0c910663d0a8e590d471ea2b0bf9ca21c1716786 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 7a5e3e9259c7e4a79637c2ff2f1986ac27b7820e
-Head: e6fb23b6cc93358a025cc8f40ab2d41d0ac09419
+Previous: 7da7c5b3804ef6418afab7c5925b13b7f92ecbb9
+Head: d94ac267cd272451281d56292c234b7bed6b1389
 Applied:
-  resv-rs-len: 411a7f62adcf39dda8e3866605f66e513b174032
-  refresh-temp: e6fb23b6cc93358a025cc8f40ab2d41d0ac09419
+  resv-rs-len: d94ac267cd272451281d56292c234b7bed6b1389
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0149e35..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 905a8f7c1ba58f27a6fdd44ab3080f3dd73ac6d7
-Top:    134799972a9b123f7a629b2a58b8f87a86ed1773
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-20 09:32:21 -0700
-
-Refresh of resv-rs-len
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index fc21ce9..6bfbed6 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -79,11 +79,15 @@ static uint32_t polling_time = 10;
-  * for data transfers:
-  * 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
-+ *            0 - no scaling factor applied
-+ *            1 - value is scaled by 64K, transfer = (value + 1) x 64
-+ * bits [15:0] length of transfer
-  * for control messages:
-- * bits [28-0]: receive credits granted
-+ * bits [28-17]: reserved
-+ * bit  [16]: scaling factor for lower 16 bits
-+ *            0 - no scaling factor applied
-+ *            1 - value is scaled by 64K, credits = (value + 1) x 64
-+ * bits [15:0] receive credits granted
-  */
- 
- enum {

diff --git a/patches/resv-rs-len b/patches/resv-rs-len
index 08dfd31c18756182bab7fc7da347be8a03559412..5788397412dde4d90aa2eb8393673989ca894f1f 100644 (file)
--- a/patches/resv-rs-len
+++ b/patches/resv-rs-len
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    905a8f7c1ba58f27a6fdd44ab3080f3dd73ac6d7
+Top:    134799972a9b123f7a629b2a58b8f87a86ed1773
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-20 09:19:22 -0700
 
@@ -27,7 +27,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index cc5effe..fc21ce9 100644
+index cc5effe..6bfbed6 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -54,6 +54,7 @@
@@ -38,16 +38,23 @@ index cc5effe..fc21ce9 100644
  #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;
+@@ -76,9 +77,17 @@ 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
++ *            0 - no scaling factor applied
++ *            1 - value is scaled by 64K, transfer = (value + 1) x 64
++ * bits [15:0] length of transfer
   * for control messages:
-  * bits [28-0]: receive credits granted
+- * bits [28-0]: receive credits granted
++ * bits [28-17]: reserved
++ * bit  [16]: scaling factor for lower 16 bits
++ *            0 - no scaling factor applied
++ *            1 - value is scaled by 64K, credits = (value + 1) x 64
++ * bits [15:0] receive credits granted
   */
+ 
+ enum {