refresh

diff --git a/meta b/meta
index 8aa4ee51059edbabf82e56142aee82952ebe1841..c11ec09de794e98289653048fd532b30be2314ff 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 1d7e57d5579cf92f83e54dfa1f8ec962de590a9a
-Head: 6491a6ce293c0be6a2726c2f538d8eb83f6f477e
+Previous: 944252b8d4982cf5e55718ef455282ebd6dbcd0c
+Head: 0c49dd38dc076a9468444afa3f9ae7c81d7128f0
 Applied:
-  pre-udp: 3201fb1717a0e1374d7eccc975d0c21714b246bb
-  refresh-temp: 6491a6ce293c0be6a2726c2f538d8eb83f6f477e
+  pre-udp: 0c49dd38dc076a9468444afa3f9ae7c81d7128f0
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/pre-udp b/patches/pre-udp
index c1c0f846ef8ece38e31ac101f69bbc4bae473959..ed6ad4b9520099f9b0448d033cd54f2a5c1c29ab 100644 (file)
--- a/patches/pre-udp
+++ b/patches/pre-udp
@@ -1,5 +1,5 @@
 Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a
-Top:    26d22c27ce9f6ea665ee146c378b4269df197ab2
+Top:    8366bf1c1029c0a297a281677772f089895218e9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-01-09 14:54:47 -0800
 
@@ -12,14 +12,24 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/src/preload.c b/src/preload.c
-index fb2149b..04ac6a0 100644
---- a/src/preload.c
-+++ b/src/preload.c
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 7be42ca..6882528 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
 @@ -1,5 +1,5 @@
  /*
-- * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2011-2013 Intel Corporation.  All rights reserved.
+- * Copyright (c) 2008-2012 Intel Corporation.  All rights reserved.
++ * Copyright (c) 2008-2013 Intel Corporation.  All rights reserved.
   *
   * This software is available to you under a choice of one of two
   * licenses.  You may choose to be licensed under the terms of the GNU
+@@ -452,6 +452,9 @@ void rs_configure(void)
+       if (init)
+               goto out;
+ 
++      if (ucma_init())
++              goto out;
++
+       if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) {
+               (void) fscanf(f, "%u", &polling_time);
+               fclose(f);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 93f70a0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: 26d22c27ce9f6ea665ee146c378b4269df197ab2
-Top:    8366bf1c1029c0a297a281677772f089895218e9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-10 16:28:36 -0800
-
-Refresh of pre-udp
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 04ac6a0..fb2149b 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2011-2013 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 7be42ca..6882528 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008-2012 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2008-2013 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-@@ -452,6 +452,9 @@ void rs_configure(void)
-       if (init)
-               goto out;
- 
-+      if (ucma_init())
-+              goto out;
-+
-       if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) {
-               (void) fscanf(f, "%u", &polling_time);
-               fclose(f);