---

yaml --- r: 277498 b: refs/heads/master c: f74024d h: refs/heads/master v: v3
git-mirror · Nov 8, 2011 · e9fdec6 · e9fdec6
1 parent 636235c
commit e9fdec6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68aad78c5023b8aa82da99b47f9d8cf40e8ca453
+refs/heads/master: f74024d9f05caa570dcf7582b498bbf011943491
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
@@ -347,7 +347,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 			 */
 			v4addr = LOOPBACK4_IPV6;
 			if (!(addr_type & IPV6_ADDR_MULTICAST))	{
-				if (!inet->transparent &&
+				if (!(inet->freebind || inet->transparent) &&
 				    !ipv6_chk_addr(net, &addr->sin6_addr,
 						   dev, 0)) {
 					err = -EADDRNOTAVAIL;