aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:01:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:01:25 -0800
commita4b4df279471ec360de11ec86640fd8a3c533487 (patch)
tree0b6a848428e7fc8eb41023b66e1e91c8b162828c
parent5ea8d3759244590defd369828c965101c97b65e1 (diff)
parent8523c0480979080e8088e40f25459e5b2d19f621 (diff)
downloadlinux-linaro-stable-a4b4df279471ec360de11ec86640fd8a3c533487.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/cm: Revert association of an RDMA device when binding to loopback
-rw-r--r--drivers/infiniband/core/cma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index cc9b5940fa97..875e34e0b235 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2115,9 +2115,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
if (ret)
goto err1;
- if (cma_loopback_addr(addr)) {
- ret = cma_bind_loopback(id_priv);
- } else if (!cma_zero_addr(addr)) {
+ if (!cma_any_addr(addr)) {
ret = rdma_translate_ip(addr, &id->route.addr.dev_addr);
if (ret)
goto err1;