refresh (create temporary patch)

diff --git a/meta b/meta
index bf1e9f894b9fb84db2515ffc2ca90dd4efae4af7..819cf2584ec977e190dacbb1c7fd149be4ed073f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: b93afdcffa7c480a204acc5958c2aca158f07a60
-Head: d773152eb29fb2ec905ccb8ad4683ef36581e637
+Previous: a6294edf5d1213f5cfa5bc7709efb445bcf3ad59
+Head: 3e68fd426e9026a22558bf73362dcd4627a06e94
 Applied:
   rs_wrid: 0d6ca1300d88377ae7f9162457e64c541a4630eb
   rs-iwarp: d773152eb29fb2ec905ccb8ad4683ef36581e637
+  refresh-temp: 3e68fd426e9026a22558bf73362dcd4627a06e94
 Unapplied:
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c
   clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..10cf6d1
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,35 @@
+Bottom: 65636beb13b8ae7b28da070da7c6de6af4e4ef9b
+Top:    bff779db354e313c0743548a5ef661a763005024
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-04-14 09:55:15 -0700
+
+Refresh of rs-iwarp
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 79aa53b..4caa93a 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1542,16 +1542,16 @@ static int rs_post_msg(struct rsocket *rs, uint32_t msg)
+       wr.wr_id = rs_send_wr_id(msg);
+       wr.next = NULL;
+       if (!(rs->opts & RS_OPT_MSG_SEND)) {
+-              wr.sg_list = &sge;
+-              wr.num_sge = 1;
+-              wr.opcode = IBV_WR_SEND;
+-              wr.send_flags = IBV_SEND_INLINE;
+-      } else {
+               wr.sg_list = NULL;
+               wr.num_sge = 0;
+               wr.opcode = IBV_WR_RDMA_WRITE_WITH_IMM;
+               wr.send_flags = 0;
+               wr.imm_data = htonl(msg);
++      } else {
++              wr.sg_list = &sge;
++              wr.num_sge = 1;
++              wr.opcode = IBV_WR_SEND;
++              wr.send_flags = IBV_SEND_INLINE;
+       }
+ 
+       return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));