refresh (create temporary patch)

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

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