---

yaml --- r: 29176 b: refs/heads/master c: 102128e h: refs/heads/master v: v3
git-mirror · Jun 23, 2006 · b71476e · b71476e
1 parent f640d70
commit b71476e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b057c6b1a25d57edf2b4d1e956e50936480a9ff
+refs/heads/master: 102128e3a27821bdcbacb10f4f2bba253f587ba4
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -862,15 +862,21 @@ static int inline ipv6_saddr_label(const struct in6_addr *addr, int type)
   * 	2002::/16		2
   * 	::/96			3
   * 	::ffff:0:0/96		4
+  *	fc00::/7		5
+  * 	2001::/32		6
   */
 	if (type & IPV6_ADDR_LOOPBACK)
 		return 0;
 	else if (type & IPV6_ADDR_COMPATv4)
 		return 3;
 	else if (type & IPV6_ADDR_MAPPED)
 		return 4;
+	else if (addr->s6_addr32[0] == htonl(0x20010000))
+		return 6;
 	else if (addr->s6_addr16[0] == htons(0x2002))
 		return 2;
+	else if ((addr->s6_addr[0] & 0xfe) == 0xfc)
+		return 5;
 	return 1;
 }