From e9fdec65eedd5b4d15ab1f7d46780e35e698c11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Mon, 7 Nov 2011 14:57:21 +0000
Subject: [PATCH] --- yaml --- r: 277498 b: refs/heads/master c:
 f74024d9f05caa570dcf7582b498bbf011943491 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8410114bd9f5..cfe95b60db76 100644
--- 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
index d27c797f9f05..1040424c788f 100644
--- 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;