---

yaml --- r: 135526 b: refs/heads/master c: 0f8d3c7 h: refs/heads/master v: v3
git-mirror · Mar 25, 2009 · b0b9c27 · b0b9c27
1 parent 077f20a
commit b0b9c27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 783ed5a78373253052bc61a3c5c8b9f17af4e3c6
+refs/heads/master: 0f8d3c7ac3693d7b6c731bf2159273a59bf70e12
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
@@ -346,8 +346,11 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 		goto out;
 	}
 
-	if (addr_type != IPV6_ADDR_ANY)
+	if (addr_type != IPV6_ADDR_ANY) {
 		sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
+		if (addr_type != IPV6_ADDR_MAPPED)
+			np->ipv6only = 1;
+	}
 	if (snum)
 		sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
 	inet->sport = htons(inet->num);