refresh

diff --git a/meta b/meta
index bf428106e59d2c5e4e22bc616fa29a20bdfd1be8..9e0b1227c291ec21278df81f2cfa5322501c3520 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 096ce450e94162d8cf864bede8c499e8756c7bb0
-Head: 4b161ac201f3dfc56804178b5a7c141188fb619b
+Previous: bde9d3d401c7c435ef2e7d5d272471eb3697c30a
+Head: 2e3560ed51e6d3daab1f287460ce8ef82f598e66
 Applied:
-  pre-udp: 0c49dd38dc076a9468444afa3f9ae7c81d7128f0
-  refresh-temp: 4b161ac201f3dfc56804178b5a7c141188fb619b
+  pre-udp: 2e3560ed51e6d3daab1f287460ce8ef82f598e66
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/pre-udp b/patches/pre-udp
index ed6ad4b9520099f9b0448d033cd54f2a5c1c29ab..a8f7e50a465711667b8f838e0b86512fd02ce2cb 100644 (file)
--- a/patches/pre-udp
+++ b/patches/pre-udp
@@ -1,5 +1,5 @@
 Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a
-Top:    8366bf1c1029c0a297a281677772f089895218e9
+Top:    1d1da945e49647331f04f82a45cc353e9541a6ae
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-01-09 14:54:47 -0800
 
@@ -13,7 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 7be42ca..6882528 100644
+index 7be42ca..9b6c667 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -1,5 +1,5 @@
@@ -23,12 +23,13 @@ index 7be42ca..6882528 100644
   *
   * 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)
+@@ -452,6 +452,10 @@ void rs_configure(void)
        if (init)
                goto out;
  
 +      if (ucma_init())
 +              goto out;
++      ucma_ib_init();
 +
        if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) {
                (void) fscanf(f, "%u", &polling_time);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 45e141c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 8366bf1c1029c0a297a281677772f089895218e9
-Top:    1d1da945e49647331f04f82a45cc353e9541a6ae
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-11 15:21:46 -0800
-
-Refresh of pre-udp
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 6882528..9b6c667 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -454,6 +454,7 @@ void rs_configure(void)
- 
-       if (ucma_init())
-               goto out;
-+      ucma_ib_init();
- 
-       if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) {
-               (void) fscanf(f, "%u", &polling_time);