refresh (create temporary patch)

diff --git a/meta b/meta
index d1bfd6f0034a05cc59729250dc2f379ec9fecfa6..2d1514503ca656222e2f8d6ca03cf37956871935 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 82eb286ba5aeffaca8a7f964a4b11df25e1a10a1
-Head: 3a1fc5e248717d04e0ca1cebab4b7b11e481e9dd
+Previous: 9639059918b48962af57d64d61c7cd3666bbcde5
+Head: ab0ae36d99f292a9afce1d9742f00234e25526c3
 Applied:
   v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
   rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
   shut_wr: 3a1fc5e248717d04e0ca1cebab4b7b11e481e9dd
+  refresh-temp: ab0ae36d99f292a9afce1d9742f00234e25526c3
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..84357c2
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,69 @@
+Bottom: fe4d692e928f917ad1c29688c0faf1fbc4bcfd01
+Top:    2ddb5fbcef7548a1d1c87870ef237d187fba4f30
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-26 14:08:48 -0700
+
+Refresh of shut_wr
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 8263def..5dfec0b 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -131,21 +131,21 @@ union rs_wr_id {
+       };
+ };
+ 
+-/*
+- * rsocket states are ordered as passive, connecting, connected, disconnected.
+- */
+ enum rs_state {
+       rs_init,
+-      rs_bound,
+-      rs_listening,
+-      rs_resolving_addr,
+-      rs_resolving_route,
+-      rs_connecting,
+-      rs_accepting,
+-      rs_connect_error,
+-      rs_connected,
+-      rs_disconnected,
+-      rs_error
++      rs_bound           =                0x0001,
++      rs_listening       =                0x0002,
++      rs_opening         =                0x0004,
++      rs_resolving_addr  = rs_opening |   0x0010,
++      rs_resolving_route = rs_opening |   0x0020,
++      rs_connecting      = rs_opening |   0x0040,
++      rs_accepting       = rs_opening |   0x0080,
++      rs_connected       =                0x0100,
++      rs_connect_wr      = rs_connected | 0x0200,
++      rs_connect_rd      = rs_connected | 0x0400,
++      rs_disconnected    =                0x0800,
++      rs_error           =                0x1000,
++      rs_connect_error   = rs_error |     0x2000
+ };
+ 
+ #define RS_OPT_SWAP_SGL 1
+@@ -701,9 +701,9 @@ do_connect:
+               if (!ret)
+                       goto connected;
+               if (errno == EAGAIN || errno == EWOULDBLOCK)
+-                      rs->state = rs_connecting;
++                      rs->state = rs_active_connect;
+               break;
+-      case rs_connecting:
++      case rs_active_connect:
+               ret = ucma_complete(rs->cm_id);
+               if (ret)
+                       break;
+@@ -1444,7 +1444,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+               return fds.revents;
+       case rs_resolving_addr:
+       case rs_resolving_route:
+-      case rs_connecting:
++      case rs_active_connect:
+       case rs_accepting:
+               ret = rs_do_connect(rs);
+               if (ret) {