refresh

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

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

diff --git a/patches/rs-iwarp b/patches/rs-iwarp
index 56dccc9dbc6902ab8ad331f86b0de2df127e0da7..f309e106bb46b23bdcfc667cd1f9e1bc7dbfd977 100644 (file)
--- a/patches/rs-iwarp
+++ b/patches/rs-iwarp
@@ -1,5 +1,5 @@
 Bottom: e8c026d3862906d30200710fcc27654d4fb2d580
-Top:    65636beb13b8ae7b28da070da7c6de6af4e4ef9b
+Top:    bff779db354e313c0743548a5ef661a763005024
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-04-11 10:05:29 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ca77116..79aa53b 100644
+index ca77116..4caa93a 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -123,6 +123,7 @@ enum {
@@ -166,16 +166,16 @@ index ca77116..79aa53b 100644
 -      wr.wr.rdma.remote_addr = addr;
 -      wr.wr.rdma.rkey = rkey;
 +      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));