diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 08:21:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 08:21:34 -0700 |
| commit | 9941fb62762253774cc6177d0b9172ece5133fe1 (patch) | |
| tree | 641fc2b376e2f84c7023aa0cd8b9d76f954cc3a1 /net/ipv6/af_inet6.c | |
| parent | a5190b4eea1f1c53ee26b3d1176441cafa8e7f79 (diff) | |
| parent | 3b1a1ce6f418cb7ab35eb55c8a6575987a524e30 (diff) | |
| download | op-kernel-dev-9941fb62762253774cc6177d0b9172ece5133fe1.zip op-kernel-dev-9941fb62762253774cc6177d0b9172ece5133fe1.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 6022098..54e8e42 100644 --- a/net/ipv6/af_inet6.c +++ b/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; |
