From 1b857cebb00e321b5f2facf693e035e5e0c865eb Mon Sep 17 00:00:00 2001
From: Ulrich Weber <uweber@astaro.com>
Date: Thu, 25 Feb 2010 23:28:58 +0000
Subject: [PATCH] --- yaml --- r: 184516 b: refs/heads/master c:
 45bb00609022ecf1d97e083666c68c74d237b799 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/net/ipv6.h       | 1 -
 trunk/net/ipv6/addrconf.c      | 3 +--
 trunk/net/ipv6/addrconf_core.c | 2 +-
 trunk/net/ipv6/route.c         | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 997adacb6011..cdcfe27fbe49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d9cfc4e354cd619d92bb938657dec3c533e6929
+refs/heads/master: 45bb00609022ecf1d97e083666c68c74d237b799
diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h
index d067db1f88c7..e72fb10ce573 100644
--- a/trunk/include/net/ipv6.h
+++ b/trunk/include/net/ipv6.h
@@ -73,7 +73,6 @@
 #define IPV6_ADDR_SCOPE_MASK	0x00f0U
 
 #define IPV6_ADDR_MAPPED	0x1000U
-#define IPV6_ADDR_RESERVED	0x2000U	/* reserved address space */
 
 /*
  *	Addr scopes
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 1b327f15e7e7..88fd8c5877ee 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -992,8 +992,7 @@ struct ipv6_saddr_dst {
 
 static inline int ipv6_saddr_preferred(int type)
 {
-	if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4|
-		    IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED))
+	if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4|IPV6_ADDR_LOOPBACK))
 		return 1;
 	return 0;
 }
diff --git a/trunk/net/ipv6/addrconf_core.c b/trunk/net/ipv6/addrconf_core.c
index 3f82e9542eda..6b03826552e1 100644
--- a/trunk/net/ipv6/addrconf_core.c
+++ b/trunk/net/ipv6/addrconf_core.c
@@ -72,7 +72,7 @@ int __ipv6_addr_type(const struct in6_addr *addr)
 				IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.3 */
 	}
 
-	return (IPV6_ADDR_RESERVED |
+	return (IPV6_ADDR_UNICAST |
 		IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.4 */
 }
 EXPORT_SYMBOL(__ipv6_addr_type);
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 88c0a5c49ae8..b08879e97f22 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1873,7 +1873,7 @@ static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes)
 	switch (ipstats_mib_noroutes) {
 	case IPSTATS_MIB_INNOROUTES:
 		type = ipv6_addr_type(&ipv6_hdr(skb)->daddr);
-		if (type == IPV6_ADDR_ANY || type == IPV6_ADDR_RESERVED) {
+		if (type == IPV6_ADDR_ANY) {
 			IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst),
 				      IPSTATS_MIB_INADDRERRORS);
 			break;