From abda6f034efadef587de89ac9786f152af7ccbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= <bonbons@linux-vserver.org>
Date: Sun, 23 Aug 2009 19:06:28 -0700
Subject: [PATCH] --- yaml --- r: 157025 b: refs/heads/master c:
 ca6982b858e1d08010c1d29d8e8255b2ac2ad70a h: refs/heads/master i:   157023:
 bd611e8641217b2f0f02f50142273feb34442cbc v: v3

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

diff --git a/[refs] b/[refs]
index 4627776a2712..a877ed4b7b6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ff9c2e7fa8ca63a575792534b63c5092099c286
+refs/heads/master: ca6982b858e1d08010c1d29d8e8255b2ac2ad70a
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index caa0278d30a9..45f9a2a42d56 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -306,8 +306,10 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 		    v4addr != htonl(INADDR_ANY) &&
 		    chk_addr_ret != RTN_LOCAL &&
 		    chk_addr_ret != RTN_MULTICAST &&
-		    chk_addr_ret != RTN_BROADCAST)
+		    chk_addr_ret != RTN_BROADCAST) {
+			err = -EADDRNOTAVAIL;
 			goto out;
+		}
 	} else {
 		if (addr_type != IPV6_ADDR_ANY) {
 			struct net_device *dev = NULL;