refresh

diff --git a/meta b/meta
index 487c99fe65849fb0c6055910b5b5c789eaceec8b..872c1b4d4c9d274781aec119fe45caeb971d0a30 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8378501d09a0215f244a0b4e8b7d979329cc92a4
-Head: 8116d0c78faabc0ada51a7dc7e7416c5ffc89edc
+Previous: e5a37b4009d2856bb5fab614a2d9f20d4ea1360b
+Head: 10e5dd48bf6f4ccab00d5fafebec06b13110d5da
 Applied:
-  rs-1sge: c03a47f017d8f919935ba4da5a66fc9b9d753b51
-  refresh-temp: 8116d0c78faabc0ada51a7dc7e7416c5ffc89edc
+  rs-1sge: 10e5dd48bf6f4ccab00d5fafebec06b13110d5da
 Unapplied:
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 445797f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 5d8567651b8275bf1758541671b1945c62afa5d7
-Top:    a6905793b5de800afb8cf1b42e0ace5122c129f5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-08 17:29:15 -0700
-
-Refresh of rs-1sge
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 0f3bc91..fa16f85 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -756,6 +756,12 @@ static int rs_post_write(struct rsocket *rs, uint64_t wr_id,
-       return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
- }
- 
-+static uint32_t rs_sbuf_left(struct rsocket *rs)
-+{
-+      return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
-+                         rs->ssge.addr);
-+}
-+
- /*
-  * Update target SGE before sending data.  Otherwise the remote side may
-  * update the entry before we do.
-@@ -791,12 +797,6 @@ static int rs_write_data(struct rsocket *rs, struct ibv_sge *sge, int flags)
-       return ret;
- }
- 
--static uint32_t rs_sbuf_left(struct rsocket *rs)
--{
--      return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
--                         rs->ssge.addr);
--}
--
- static void rs_send_credits(struct rsocket *rs)
- {
-       struct ibv_sge ibsge;

diff --git a/patches/rs-1sge b/patches/rs-1sge
index 7709df6c74aeeda662ae91018e4473918fa8b585..19f0b62eb59efd23f4416c7e6e505002db98eb02 100644 (file)
--- a/patches/rs-1sge
+++ b/patches/rs-1sge
@@ -1,5 +1,5 @@
 Bottom: 19653040b4f6827e46b2b5079ab41e32a223fc76
-Top:    5d8567651b8275bf1758541671b1945c62afa5d7
+Top:    a6905793b5de800afb8cf1b42e0ace5122c129f5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 14:36:41 -0700
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index a3c2c6a..0f3bc91 100644
+index a3c2c6a..fa16f85 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -95,6 +95,10 @@ enum {
@@ -96,7 +96,17 @@ index a3c2c6a..0f3bc91 100644
        qp_attr.cap.max_recv_sge = 1;
        qp_attr.cap.max_inline_data = rs->sq_inline;
  
-@@ -775,35 +760,41 @@ static int rs_post_write(struct rsocket *rs, uint64_t wr_id,
+@@ -771,39 +756,45 @@ static int rs_post_write(struct rsocket *rs, uint64_t wr_id,
+       return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
+ }
+ 
++static uint32_t rs_sbuf_left(struct rsocket *rs)
++{
++      return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
++                         rs->ssge.addr);
++}
++
+ /*
   * Update target SGE before sending data.  Otherwise the remote side may
   * update the entry before we do.
   */
@@ -129,6 +139,12 @@ index a3c2c6a..0f3bc91 100644
        }
  
 -      return rs_post_write(rs, wr_id.wr_id, sgl, nsge, imm_data, flags, addr, rkey);
+-}
+-
+-static uint32_t rs_sbuf_left(struct rsocket *rs)
+-{
+-      return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
+-                         rs->ssgl[0].addr);
 +      ret = rs_post_write(rs, rs_wrid_set(1, len), sge, 1,
 +                          rs_msg_set(RS_OP_DATA, len), flags, addr, rkey);
 +      if (len < rs_sbuf_left(rs))
@@ -138,13 +154,6 @@ index a3c2c6a..0f3bc91 100644
 +      return ret;
  }
  
- static uint32_t rs_sbuf_left(struct rsocket *rs)
- {
-       return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
--                         rs->ssgl[0].addr);
-+                         rs->ssge.addr);
- }
- 
  static void rs_send_credits(struct rsocket *rs)
 @@ -863,7 +854,6 @@ static void rs_update_credits(struct rsocket *rs)
  static int rs_poll_cq(struct rsocket *rs)