refresh

diff --git a/meta b/meta
index 7ee96d773988a30f1d100405f81b4a08bc4f9e2a..864f99cbb4dd76dac2895f0ab5530ddb46418193 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 404cc9b6e749966a50f3af004a250e9440a616e9
-Head: dbe93260801c22a3e197b0cfc289a035c48f025f
+Previous: 91f3e431461cd04b78fa95394030a9c0413a09c1
+Head: 31914813181fd5109970a402eaf64d77678713fb
 Applied:
-  rs-iwarp: 6fd4b589ad02ce05a2fc4efae15f59bd103d50c2
-  refresh-temp: dbe93260801c22a3e197b0cfc289a035c48f025f
+  rs-iwarp: 31914813181fd5109970a402eaf64d77678713fb
 Unapplied:
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c
   clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4fd5295..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: c5c0a8d77b30dce5118ede52a82222293855e48c
-Top:    ada72972ae703c69e7f04146245c4890486e2a3b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-04-25 12:13:53 -0700
-
-Refresh of rs-iwarp
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index f529a3c..0d84d02 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1769,7 +1769,7 @@ static int rs_poll_cq(struct rsocket *rs)
-                       if (wc.wc_flags & IBV_WC_WITH_IMM) {
-                               msg = ntohl(wc.imm_data);
-                       } else {
--                              msg = ((uint32_t *) rs->rbuf + rs->rbuf_size)
-+                              msg = ((uint32_t *) (rs->rbuf + rs->rbuf_size))
-                                       [rs_wr_data(wc.wr_id)];
- 
-                       }

diff --git a/patches/rs-iwarp b/patches/rs-iwarp
index ed1302613f0aeacc02b84b3903086c0491927303..f35ed19fec36e1ec3a2629f9890e39eb6c1440d6 100644 (file)
--- a/patches/rs-iwarp
+++ b/patches/rs-iwarp
@@ -1,5 +1,5 @@
 Bottom: e8c026d3862906d30200710fcc27654d4fb2d580
-Top:    c5c0a8d77b30dce5118ede52a82222293855e48c
+Top:    ada72972ae703c69e7f04146245c4890486e2a3b
 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..f529a3c 100644
+index ca77116..0d84d02 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -123,6 +123,7 @@ enum {
@@ -292,7 +292,7 @@ index ca77116..f529a3c 100644
 +                      if (wc.wc_flags & IBV_WC_WITH_IMM) {
 +                              msg = ntohl(wc.imm_data);
 +                      } else {
-+                              msg = ((uint32_t *) rs->rbuf + rs->rbuf_size)
++                              msg = ((uint32_t *) (rs->rbuf + rs->rbuf_size))
 +                                      [rs_wr_data(wc.wr_id)];
 +
 +                      }