diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /drivers/infiniband/core/addr.c | |
| parent | 26179670a68b7b365fbfe38afb043dcd2e1a4678 (diff) | |
| parent | 8d829b9bb878904f3419af8003176a12910b94e8 (diff) | |
| download | linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.gz linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.bz2 linux-a4eb8b993554d374002663200bf5721f7f2ee259.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/core/addr.c')
| -rw-r--r-- | drivers/infiniband/core/addr.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index 02971e239a18..ece6926fa2e6 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, return ret; rt = (struct rt6_info *)dst; - if (ipv6_addr_any(&fl6.saddr)) { - ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev, - &fl6.daddr, 0, &fl6.saddr); - if (ret) - goto put; - + if (ipv6_addr_any(&src_in->sin6_addr)) { src_in->sin6_family = AF_INET6; src_in->sin6_addr = fl6.saddr; } @@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, *pdst = dst; return 0; -put: - dst_release(dst); - return ret; } #else static int addr6_resolve(struct sockaddr_in6 *src_in, |