From a8de8ecb951dc07aa4533e58611e0cdb48551c39 Mon Sep 17 00:00:00 2001 From: Balazs Scheidler Date: Thu, 21 Oct 2010 16:10:03 +0200 Subject: [PATCH] --- yaml --- r: 215493 b: refs/heads/master c: 0a513f6af962525ed4b3395f8c8d5daae8682aa9 h: refs/heads/master i: 215491: 31386458847a29681d374b11d4507e0709eb20eb v: v3 --- [refs] | 2 +- trunk/net/ipv6/af_inet6.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6249f302b343..037d2c0fd35d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c46862280c5f55eda7750391bc65cd7e08c7535 +refs/heads/master: 0a513f6af962525ed4b3395f8c8d5daae8682aa9 diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c index 56b9bf2516f4..4869797c1afa 100644 --- a/trunk/net/ipv6/af_inet6.c +++ b/trunk/net/ipv6/af_inet6.c @@ -343,7 +343,8 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) */ v4addr = LOOPBACK4_IPV6; if (!(addr_type & IPV6_ADDR_MULTICAST)) { - if (!ipv6_chk_addr(net, &addr->sin6_addr, + if (!inet->transparent && + !ipv6_chk_addr(net, &addr->sin6_addr, dev, 0)) { err = -EADDRNOTAVAIL; goto out_unlock;