refresh

diff --git a/meta b/meta
index eaca33b5983eeabb9a893d3540e62d3459022f91..8d756fcab962682a037a7d8174e8591ec0bea2b2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: c01e087da2a986e562292e6ed8b24e624b774788
-Head: ed3e713dfee0fd7305cfc49bdb8c49bcbb2dc0f0
+Previous: 1d93ec69844cd0f7d93527b3ae10073f91d8f2bc
+Head: 4269cbaac88f36ec17bff5a4704cbf9bbef2ba93
 Applied:
   kern-bug: 69fadb50636d98de57c9069b83adf6d2c5c77fc6
-  rstream-cnt: 98893a8426e792956991ab6ef5afe90f4be72a34
-  refresh-temp: ed3e713dfee0fd7305cfc49bdb8c49bcbb2dc0f0
+  rstream-cnt: 4269cbaac88f36ec17bff5a4704cbf9bbef2ba93
 Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4b3f3d4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 63d9ee86b7812695228cc4f4018bf998f3eaaa39
-Top:    b0e12e6e959fe7f8602534721beb9071fdac33aa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-02-04 16:53:18 -0800
-
-Refresh of rstream-cnt
-
----
-
-diff --git a/examples/common.c b/examples/common.c
-index 939f50c..8be27d6 100644
---- a/examples/common.c
-+++ b/examples/common.c
-@@ -123,10 +123,8 @@ int size_to_count(int size)
-               return 1000;
-       else if (size >= 10000)
-               return 10000;
--      else if (size >= 1000)
-+      else (size >= 1000)
-               return 100000;
--      else
--              return 1000000;
- }
- 
- void format_buf(void *buf, int size)

diff --git a/patches/rstream-cnt b/patches/rstream-cnt
index 9e07d5465e0445b412a7fe8ae63bfc0153f5e387..a17315b3ae8e9cd2cff611931b68a703365babb1 100644 (file)
--- a/patches/rstream-cnt
+++ b/patches/rstream-cnt
@@ -1,5 +1,5 @@
 Bottom: 63d9ee86b7812695228cc4f4018bf998f3eaaa39
-Top:    63d9ee86b7812695228cc4f4018bf998f3eaaa39
+Top:    b0e12e6e959fe7f8602534721beb9071fdac33aa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-02-04 16:52:18 -0800
 
@@ -16,4 +16,19 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/common.c b/examples/common.c
+index 939f50c..8be27d6 100644
+--- a/examples/common.c
++++ b/examples/common.c
+@@ -123,10 +123,8 @@ int size_to_count(int size)
+               return 1000;
+       else if (size >= 10000)
+               return 10000;
+-      else if (size >= 1000)
++      else (size >= 1000)
+               return 100000;
+-      else
+-              return 1000000;
+ }
+ 
+ void format_buf(void *buf, int size)