From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 29 Aug 2012 23:14:48 +0000 (-0700)
Subject: Refresh of addrinfo-af-ib
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a25924a9e1410116a1c082e3f3ed0079d33ca93a;p=~shefty%2Flibrdmacm.git

Refresh of addrinfo-af-ib
---

diff --git a/src/addrinfo.c b/src/addrinfo.c
index c7297201..01c04d18 100755
--- a/src/addrinfo.c
+++ b/src/addrinfo.c
@@ -56,9 +56,12 @@
 static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
 {
 	memset(ai, 0, sizeof *ai);
-	ai->ai_flags  = (rai->ai_flags & RAI_PASSIVE) ? AI_PASSIVE : 0;
-	ai->ai_flags |= (rai->ai_flags & RAI_NUMERICHOST) ? AI_NUMERICHOST : 0;
-	ai->ai_family = rai->ai_family;
+	if (rai->ai_flags & RAI_PASSIVE)
+		ai->ai_flags = AI_PASSIVE;
+	if (rai->ai_flags & RAI_NUMERICHOST)
+		ai->ai_flags |= AI_NUMERICHOST;
+	if (rai->ai_family != AF_IB)
+		ai->ai_family = rai->ai_family;
 
 	switch (rai->ai_qp_type) {
 	case IBV_QPT_RC: