[Pkg-ofed-commits] [libfabric] 91/123: prov/sockets: enable rx/tx attr primary caps only if requested by app

[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 4907dce6d13c09825e908fc8ec4bfb48fbe0e24f
Author: Jithin Jose <jithin.jose at intel.com>
Date:   Tue Sep 22 10:45:03 2015 -0700

    prov/sockets: enable rx/tx attr primary caps only if requested by app
    
    Signed-off-by: Jithin Jose <jithin.jose at intel.com>
---
 prov/sockets/src/sock_ep_dgram.c | 8 ++++++--
 prov/sockets/src/sock_ep_msg.c   | 8 ++++++--
 prov/sockets/src/sock_ep_rdm.c   | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/prov/sockets/src/sock_ep_dgram.c b/prov/sockets/src/sock_ep_dgram.c
index 2af6386..da9318f 100644
--- a/prov/sockets/src/sock_ep_dgram.c
+++ b/prov/sockets/src/sock_ep_dgram.c
@@ -227,9 +227,13 @@ int sock_dgram_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_DGRAM_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if (hints && hints->caps)
+        if (hints && hints->caps) {
                 (*info)->caps = SOCK_EP_DGRAM_SEC_CAP | hints->caps;
-
+		(*info)->rx_attr->caps = SOCK_EP_DGRAM_SEC_CAP |
+			((*info)->rx_attr->caps & (*info)->caps);
+		(*info)->tx_attr->caps = SOCK_EP_DGRAM_SEC_CAP |
+			((*info)->tx_attr->caps & (*info)->caps);
+	}
 	return 0;
 }
 
diff --git a/prov/sockets/src/sock_ep_msg.c b/prov/sockets/src/sock_ep_msg.c
index edb57c6..0d616ca 100644
--- a/prov/sockets/src/sock_ep_msg.c
+++ b/prov/sockets/src/sock_ep_msg.c
@@ -229,9 +229,13 @@ int sock_msg_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_MSG_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if (hints && hints->caps)
+        if (hints && hints->caps) {
                 (*info)->caps = SOCK_EP_MSG_SEC_CAP | hints->caps;
-
+		(*info)->rx_attr->caps = SOCK_EP_MSG_SEC_CAP |
+			((*info)->rx_attr->caps & (*info)->caps);
+		(*info)->tx_attr->caps = SOCK_EP_MSG_SEC_CAP |
+			((*info)->tx_attr->caps & (*info)->caps);
+	}
 	return 0;
 }
 
diff --git a/prov/sockets/src/sock_ep_rdm.c b/prov/sockets/src/sock_ep_rdm.c
index 6a5d294..01f1be6 100644
--- a/prov/sockets/src/sock_ep_rdm.c
+++ b/prov/sockets/src/sock_ep_rdm.c
@@ -272,9 +272,13 @@ int sock_rdm_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_RDM_CAP |
 			(*info)->rx_attr->caps | (*info)->tx_attr->caps;
-	if (hints && hints->caps)
+	if (hints && hints->caps) {
 		(*info)->caps = SOCK_EP_RDM_SEC_CAP | hints->caps;
-
+		(*info)->rx_attr->caps = SOCK_EP_RDM_SEC_CAP |
+			((*info)->rx_attr->caps & (*info)->caps);
+		(*info)->tx_attr->caps = SOCK_EP_RDM_SEC_CAP |
+			((*info)->tx_attr->caps & (*info)->caps);
+	}
 	return 0;
 }
 

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