From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 2 Aug 2013 22:00:58 +0000 (-0700)
Subject: Refresh of rs-setroute
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=903fe2e72d3e49b033446645798c4b5c50062ba1;p=~shefty%2Flibrdmacm.git

Refresh of rs-setroute
---

diff --git a/src/rsocket.c b/src/rsocket.c
index d64c3bb8..57df2907 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)