refresh

diff --git a/meta b/meta
index 5222b768259f45f3d42e1efd3d6cae8bbe14dcc3..52eef156be1da0469d53c17466dc7cb66d7d2590 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 4fd42290ea94d0abbdad6efb6eb3fb8e795b1cd8
-Head: 9117865ec344d62e30f0a2a56f4cac1e43693c64
+Previous: bb720eca1c9700b70dfd463cf313f2de4e1d15ef
+Head: 2625a8a7f37fe6126242b7728bf18b25a5b6ee12
 Applied:
   ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e
   rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45
   rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1
-  rs-spin: 68a62bc98bd991130af0c0ef432d10c922600846
-  refresh-temp: 9117865ec344d62e30f0a2a56f4cac1e43693c64
+  rs-spin: 2625a8a7f37fe6126242b7728bf18b25a5b6ee12
 Unapplied:
   rs-defaults: 5501d786f18e25467a01195ca7464313bcceb5b2
   buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 07e4a14..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 9023ede0dfcb282ab90f7726e5c637c9ff842534
-Top:    b81754028658b7a877798e12b2fd67dd9d2ae0be
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-05 17:05:53 -0700
-
-Refresh of rs-spin
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 90f9a10..f53f1c8 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -66,7 +66,7 @@
- static struct index_map idm;
- static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- 
--static uint32_t polling_time;
-+static uint32_t polling_time = 10;
- 
- /*
-  * Immediate data format is determined by the upper bits

diff --git a/patches/rs-spin b/patches/rs-spin
index 9223eda24b3361f9a77cf0b3e2d615e4d1dab134..6719c945042aa70d7865cd550f775860bcb5d626 100644 (file)
--- a/patches/rs-spin
+++ b/patches/rs-spin
@@ -1,5 +1,5 @@
 Bottom: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1
-Top:    9023ede0dfcb282ab90f7726e5c637c9ff842534
+Top:    b81754028658b7a877798e12b2fd67dd9d2ae0be
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-04 14:51:41 -0700
 
@@ -68,7 +68,7 @@ index 2ee4767..cedc0c3 100644
 +
  #endif /* CMA_H */
 diff --git a/src/rsocket.c b/src/rsocket.c
-index e899e8a..90f9a10 100644
+index e899e8a..f53f1c8 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -37,10 +37,12 @@
@@ -88,7 +88,7 @@ index e899e8a..90f9a10 100644
  static struct index_map idm;
  static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
  
-+static uint32_t polling_time;
++static uint32_t polling_time = 10;
 +
  /*
   * Immediate data format is determined by the upper bits