diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
| commit | 6dd7abae7110da6fa01f048baf5b679b5a4a56dd (patch) | |
| tree | 17ca298bbae17f05bdadae7f88e3be0f113a713f /drivers/infiniband/core/cma.c | |
| parent | 6df6b4a9ce43deb57d3e23b0e79a529464b5cf37 (diff) | |
| parent | 646ebd4166ca00bdf682a36bd2e1c9a74d848ac6 (diff) | |
Merge branch 'k.o/for-4.10-rc' into HEAD
Diffstat (limited to 'drivers/infiniband/core/cma.c')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index ba60e4b5114c..dab2a96ea032 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2851,7 +2851,8 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, if (!src_addr || !src_addr->sa_family) { src_addr = (struct sockaddr *) &id->route.addr.src_addr; src_addr->sa_family = dst_addr->sa_family; - if (dst_addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_IPV6) && + dst_addr->sa_family == AF_INET6) { struct sockaddr_in6 *src_addr6 = (struct sockaddr_in6 *) src_addr; struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *) dst_addr; src_addr6->sin6_scope_id = dst_addr6->sin6_scope_id; |