From ec6d8f6ee7fb0eab81298462bd9bccdca714cfd0 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 13 Nov 2013 12:16:32 -0800 Subject: [PATCH] commit --- meta | 3 +-- patches/bindgid | 37 ------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 patches/bindgid diff --git a/meta b/meta index 1941b605..ac3064ae 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: 27164db0f8265f5a3873fde0a99592a403a50a00 +Previous: 40aaf49aa38ba6c1dd80eee87bf852dce83bc08d Head: c38d43aa2d5dc39dd98f813749dfa496875ad2e1 Applied: - bindgid: c38d43aa2d5dc39dd98f813749dfa496875ad2e1 Unapplied: old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3 old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c diff --git a/patches/bindgid b/patches/bindgid deleted file mode 100644 index fde3da56..00000000 --- a/patches/bindgid +++ /dev/null @@ -1,37 +0,0 @@ -Bottom: 45950061e96f3725b666bbe4061f648f52898e90 -Top: 3f0f755cc697431003b30643243d3810ff2c40fe -Author: Sean Hefty -Date: 2013-11-11 10:24:54 -0800 - -Retrieve SGID after calling rdma_bind_addr - -A change was made to rdma_bind_addr when AF_IB is enabled -to only retrieve the resulting bound address. Previously, -rdma_bind_addr would retrieve the corresponding SGID as -well. This breaks some apps which were checking the -SGID after binding to an IP address. Revert to the -previous behavior of also retrieving the SGID after -calling rdma_bind_addr. - -Tested-by: Christoph Lameter -Signed-off-by: Sean Hefty - - ---- - -diff --git a/src/cma.c b/src/cma.c -index 4f41879..0cf4203 100644 ---- a/src/cma.c -+++ b/src/cma.c -@@ -753,7 +753,10 @@ static int rdma_bind_addr2(struct rdma_cm_id *id, struct sockaddr *addr, - if (ret != sizeof cmd) - return (ret >= 0) ? ERR(ENODATA) : -1; - -- return ucma_query_addr(id); -+ ret = ucma_query_addr(id); -+ if (!ret) -+ ret = ucma_query_gid(id); -+ return ret; - } - - int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) -- 2.41.0