[Pkg-ofed-commits] [libfabric] 38/123: prov/verbs: Delete ib_rai from the list only if caller requested rai

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to annotated tag v1.1.1
in repository libfabric.

commit f0c2c767eeadee9d518bdbf1638734981101592b
Author: Arun C Ilango <arun.ilango at intel.com>
Date:   Tue Sep 8 14:45:02 2015 -0700

    prov/verbs: Delete ib_rai from the list only if caller requested rai
    
    Delete ib_rai from the returned list of rai only if the caller of
    fi_ibv_create_ep requested rai to be returned.
    
    Signed-off-by: Arun C Ilango <arun.ilango at intel.com>
---
 prov/verbs/src/fi_verbs.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/prov/verbs/src/fi_verbs.c b/prov/verbs/src/fi_verbs.c
index 437be09..21399c2 100644
--- a/prov/verbs/src/fi_verbs.c
+++ b/prov/verbs/src/fi_verbs.c
@@ -973,10 +973,11 @@ fi_ibv_create_ep(const char *node, const char *service,
 		goto out;
 	}
 
-	/* Remove ib_rai entries added by IBACM to prevent wrong
-	 * ib_connect_hdr from being sent in connect request.
-	 * TODO Choose ib_rai if we came here from fi_endpoint */
-	if (hints && hints->addr_format != FI_SOCKADDR_IB) {
+	/*
+	 * If caller requested rai, remove ib_rai entries added by IBACM to
+	 * prevent wrong ib_connect_hdr from being sent in connect request.
+	 */
+	if (rai && hints && (hints->addr_format != FI_SOCKADDR_IB)) {
 		for (rai_current = &_rai; *rai_current;) {
 			struct rdma_addrinfo *rai_next;
 			if ((*rai_current)->ai_family == AF_IB) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libfabric.git