refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..93f70a0
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,41 @@
+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);