refresh

diff --git a/meta b/meta
index a77162bd93d6ad4bb21737f7917d9645328a54d5..e646c9f0a80642026c0d374c9f85bb532640e13a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 71043c59b0343fe1d64c5e6316f86583300041a9
-Head: fc1e80494287227ed02922d41c5732cd3932cd62
+Previous: 1df1a2fa812015d68fcf200accab7ed9ebb6f44a
+Head: adee5db68a8f004ef5a94dc0cad94b74bf685088
 Applied:
-  rs-qpsize: 01d4813af111f2309583f439a5120be86616dd3e
-  refresh-temp: fc1e80494287227ed02922d41c5732cd3932cd62
+  rs-qpsize: adee5db68a8f004ef5a94dc0cad94b74bf685088
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 049e1e9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: b37d006a6372969ddf786ae8c3abe0509cfaef04
-Top:    716b79e70dbab52362acd7d5f3617b47129f7001
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-20 22:11:16 -0700
-
-Refresh of rs-qpsize
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 495c2e3..331db78 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -344,7 +344,7 @@ static int rs_create_ep(struct rsocket *rs)
-       struct ibv_qp_init_attr qp_attr;
-       int i, ret;
- 
--      rs_check_qp_size(rs);
-+      rs_set_qp_size(rs);
-       ret = rs_init_bufs(rs);
-       if (ret)
-               return ret;

diff --git a/patches/rs-qpsize b/patches/rs-qpsize
index 3e735f9d3aeb2ce499e1373e965d3fb3cd2874db..15c8fe0519e7e4065f07df43f14e3e56479bb19e 100644 (file)
--- a/patches/rs-qpsize
+++ b/patches/rs-qpsize
@@ -1,5 +1,5 @@
 Bottom: 6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
-Top:    b37d006a6372969ddf786ae8c3abe0509cfaef04
+Top:    716b79e70dbab52362acd7d5f3617b47129f7001
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 17:07:11 -0700
 
@@ -29,7 +29,7 @@ index 7703fe8..669b681 100644
  /*
   * Fast synchronization for low contention locking.
 diff --git a/src/rsocket.c b/src/rsocket.c
-index de0ec3e..495c2e3 100644
+index de0ec3e..331db78 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -55,6 +55,8 @@
@@ -133,7 +133,7 @@ index de0ec3e..495c2e3 100644
        struct ibv_qp_init_attr qp_attr;
        int i, ret;
  
-+      rs_check_qp_size(rs);
++      rs_set_qp_size(rs);
        ret = rs_init_bufs(rs);
        if (ret)
                return ret;