From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 20 Aug 2012 16:12:46 +0000 (-0700)
Subject: Refresh of rs-fix
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3953f633c7a99a97b34b365c9530fdbf56db3d96;p=~shefty%2Flibrdmacm.git

Refresh of rs-fix
---

diff --git a/src/preload.c b/src/preload.c
index 8f19af59..474287e8 100644
--- a/src/preload.c
+++ b/src/preload.c
@@ -520,7 +520,7 @@ static void fork_active(int socket)
 	if ((ret != sizeof msg) || msg)
 		goto err2;
 
-	ret = rconnect(ret, (struct sockaddr *) &addr, len);
+	ret = rconnect(dfd, (struct sockaddr *) &addr, len);
 	if (ret)
 		goto err2;
 
@@ -618,9 +618,9 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
 
 	fdi = idm_lookup(&idm, index);
 	if (fdi) {
-		if (fdi->type == fd_fork_passive)
+		if (fdi->state == fd_fork_passive)
 			fork_passive(index);
-		else if (fdi->type == fd_fork_active)
+		else if (fdi->state == fd_fork_active)
 			fork_active(index);
 		*fd = fdi->fd;
 		return fdi->type;