pop

diff --git a/meta b/meta
index 953f0cfa4a68db99158be18181806aacda86ceef..d93b27c4b55a498c26dc3b07de6c8cfc6ac33a65 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: b9bf95a928a4af0f9adcdbfdde9737cba2b7718f
-Head: fd753fb9e36b4ec5f5da3e0d2ee588297a172736
+Previous: 736d4dfe2bf524bc9d965c3a3c229278333f6ea8
+Head: 5a39fae0e595b08ff2b5ca58896ee0ecd51ab66c
 Applied:
   rs-shutdown: 110fcad2ecce39d6888448c19b08791ea193e7f9
   rs-maxseg: b99bd0638e7d22b1b0976a34a58efd352db420b3
   rs-spin: fd753fb9e36b4ec5f5da3e0d2ee588297a172736
+  rs-defaults: 5a39fae0e595b08ff2b5ca58896ee0ecd51ab66c
 Unapplied:
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
-  rs-defaults: 789cb60192f30396cc0ad7940fdd402bdce127f0
   buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/rs-defaults b/patches/rs-defaults
index 27003bd09f80abd0135a9ca152a77b22d6766c42..6300c80012ddeb801b4ec7cd0b41182f8281028a 100644 (file)
--- a/patches/rs-defaults
+++ b/patches/rs-defaults
@@ -1,5 +1,5 @@
-Bottom: b81754028658b7a877798e12b2fd67dd9d2ae0be
-Top:    d90367263f5a974038034a311c40904c960afdff
+Bottom: 9a355c4fd6adc489cc0c3c07b3d436d25ff2cb0c
+Top:    12cda031f6e4027c6df650d4c84ed637ba93cdf8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-05 15:28:18 -0700
 
@@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index f53f1c8..f7a0fdd 100644
+index d7344c7..5e0e413 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -53,19 +53,20 @@
@@ -51,7 +51,7 @@ index f53f1c8..f7a0fdd 100644
  static uint32_t polling_time = 10;
  
  /*
-@@ -217,6 +218,40 @@ void rs_configure(void)
+@@ -216,6 +217,40 @@ void rs_configure(void)
                fscanf(f, "%u", &polling_time);
                fclose(f);
        }
@@ -92,7 +92,7 @@ index f53f1c8..f7a0fdd 100644
        init = 1;
  out:
        pthread_mutex_unlock(&mut);
-@@ -265,9 +300,11 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs)
+@@ -264,9 +299,11 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs)
                rs->rq_size = inherited_rs->rq_size;
                rs->ctrl_avail = inherited_rs->ctrl_avail;
        } else {