refresh

diff --git a/meta b/meta
index d4fabe9cdbbe110dd6a31185e48460df17c3cbe6..cce9b693a1b7212290015ffe6916ba1f8b9346e9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: f62cbfbb8bf5b95655cb3d33a36aab03362f5409
-Head: dd6737373d36a3d9feda9961b7bba0e16e548ec6
+Previous: 079489640d516e8a03ed833a705bb409923708f2
+Head: 2745bf763a8bf2122ec8c1f75aef92387df6220d
 Applied:
   v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
   rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
-  shut_wr: 84bdc5da587b58be831799eac853c7db9886a22d
-  refresh-temp: dd6737373d36a3d9feda9961b7bba0e16e548ec6
+  shut_wr: 2745bf763a8bf2122ec8c1f75aef92387df6220d
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7e7ca70..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: 1ae738a42c25e6d2f1c92e4e79e5653b620de2c4
-Top:    0e6b8c5a5f999b6695127164e8c2493cb15abf49
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-25 17:12:24 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 63bf03e..0bba7e5 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -96,8 +96,7 @@ enum {
- #define rs_msg_data(imm_data) (imm_data & 0x1FFFFFFF)
- 
- enum {
--      RS_CTRL_DISCONNECT,
--      RS_CTRL_SHUTDOWN
-+      RS_CTRL_DISCONNECT
- };
- 
- struct rs_msg {
-@@ -884,8 +883,6 @@ static int rs_poll_cq(struct rsocket *rs)
-                               if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) {
-                                       rs->state = rs_disconnected;
-                                       return ERR(ECONNRESET);
--                              } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
--                                      rs->state = rs_shutdown_rd;
-                               }
-                               break;
-                       default:

diff --git a/patches/shut_wr b/patches/shut_wr
index 0ff742d562e3ce96473d9ff49cb7ff57810c6f54..9a969751556b863fd82151ecc935f7e275d7d3f0 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 938168c7141b54196d5a134aca1fe7c88dcfb3b5
-Top:    1ae738a42c25e6d2f1c92e4e79e5653b620de2c4
+Top:    0e6b8c5a5f999b6695127164e8c2493cb15abf49
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
@@ -11,20 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed994fe..63bf03e 100644
+index ed994fe..0bba7e5 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -96,7 +96,8 @@ enum {
- #define rs_msg_data(imm_data) (imm_data & 0x1FFFFFFF)
- 
- enum {
--      RS_CTRL_DISCONNECT
-+      RS_CTRL_DISCONNECT,
-+      RS_CTRL_SHUTDOWN
- };
- 
- struct rs_msg {
-@@ -321,7 +322,7 @@ static int rs_set_nonblocking(struct rsocket *rs, long arg)
+@@ -321,7 +321,7 @@ static int rs_set_nonblocking(struct rsocket *rs, long arg)
        if (rs->cm_id->recv_cq_channel)
                ret = fcntl(rs->cm_id->recv_cq_channel->fd, F_SETFL, arg);
  
@@ -33,16 +23,7 @@ index ed994fe..63bf03e 100644
                ret = fcntl(rs->cm_id->channel->fd, F_SETFL, arg);
  
        return ret;
-@@ -883,6 +884,8 @@ static int rs_poll_cq(struct rsocket *rs)
-                               if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) {
-                                       rs->state = rs_disconnected;
-                                       return ERR(ECONNRESET);
-+                              } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
-+                                      rs->state = rs_shutdown_rd;
-                               }
-                               break;
-                       default:
-@@ -907,7 +910,7 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -907,7 +907,7 @@ static int rs_poll_cq(struct rsocket *rs)
                }
        }
  
@@ -51,7 +32,7 @@ index ed994fe..63bf03e 100644
                while (!ret && rcnt--)
                        ret = rdma_post_recvv(rs->cm_id, NULL, NULL, 0);
  
-@@ -932,7 +935,7 @@ static int rs_get_cq_event(struct rsocket *rs)
+@@ -932,7 +932,7 @@ static int rs_get_cq_event(struct rsocket *rs)
        if (!ret) {
                ibv_ack_cq_events(rs->cm_id->recv_cq, 1);
                rs->cq_armed = 0;
@@ -60,7 +41,7 @@ index ed994fe..63bf03e 100644
                rs->state = rs_error;
        }
  
-@@ -1457,6 +1460,8 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1457,6 +1457,8 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                }
                /* fall through */
        case rs_connected:
@@ -69,7 +50,7 @@ index ed994fe..63bf03e 100644
        case rs_disconnected:
        case rs_error:
                rs_process_cq(rs, nonblock, test);
-@@ -1466,10 +1471,12 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1466,10 +1468,12 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                        revents |= POLLIN;
                if ((events & POLLOUT) && rs_can_send(rs))
                        revents |= POLLOUT;
@@ -86,7 +67,7 @@ index ed994fe..63bf03e 100644
  
                return revents;
        case rs_connect_error:
-@@ -1690,12 +1697,16 @@ int rshutdown(int socket, int how)
+@@ -1690,12 +1694,16 @@ int rshutdown(int socket, int how)
        struct rsocket *rs;
        int ret = 0;
  
@@ -104,7 +85,7 @@ index ed994fe..63bf03e 100644
                if (!rs_can_send_ctrl(rs)) {
                        ret = rs_process_cq(rs, 0, rs_can_send_ctrl);
                        if (ret)
-@@ -1711,6 +1722,9 @@ int rshutdown(int socket, int how)
+@@ -1711,6 +1719,9 @@ int rshutdown(int socket, int how)
        if (!rs_all_sends_done(rs) && rs->state != rs_error)
                rs_process_cq(rs, 0, rs_all_sends_done);