refresh (create temporary patch)

diff --git a/meta b/meta
index 8a5bf6b8872f41314de5e38abc5d9c184c5bcf61..90d0e901e6b4edc148c35b5b047696e64e07305f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 3f7003e6ed51f76a822e7e8b8bdee06994a464c3
-Head: 0def231e39add7b925ef19bb1f321a769acb1e8d
+Previous: d5821baf4a8341770bd22e15982ab2c95dda57cd
+Head: 903fe2e72d3e49b033446645798c4b5c50062ba1
 Applied:
   rst-afib: 34148679ac24e294b1157d24f240b09e8aa7603a
   ex-afib: f137c61b3e9db128e1614c429c1e382de4448146
   rs-setroute: 0def231e39add7b925ef19bb1f321a769acb1e8d
+  refresh-temp: 903fe2e72d3e49b033446645798c4b5c50062ba1
 Unapplied:
   setopt: c97e5c95daf517efa5eb15313e3702d270adc2e1
   stpath: 1cb6e2ff7b509d52b0dec27b0f5ee4d15155b2f8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..064ac70
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,36 @@
+Bottom: 4fa2d2eb3eeeff4c1dc33c67228929fcfd37b5cf
+Top:    437b957f9b9b33615925d25b01225db9c40789c0
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-08-02 15:00:58 -0700
+
+Refresh of rs-setroute
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index d64c3bb..57df290 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1251,15 +1251,20 @@ resolve_route:
+                                             rs->optlen);
+                       free(rs->optval);
+                       rs->optval = NULL;
++                      if (!ret) {
++                              rs->state = rs_resolving_route;
++                              goto resolving_route;
++                      }
+               } else {
+                       ret = rdma_resolve_route(rs->cm_id, to);
++                      if (!ret)
++                              goto do_connect;
+               }
+-              if (!ret)
+-                      goto do_connect;
+               if (errno == EAGAIN || errno == EWOULDBLOCK)
+                       rs->state = rs_resolving_route;
+               break;
+       case rs_resolving_route:
++resolving_route:
+               ret = ucma_complete(rs->cm_id);
+               if (ret) {
+                       if (errno == ETIMEDOUT && rs->retries <= RS_CONN_RETRIES)