---

yaml --- r: 150337 b: refs/heads/master c: 9af2851 h: refs/heads/master i: 150335: 8973956 v: v3
git-mirror · May 19, 2009 · fcd1a41 · fcd1a41
1 parent 8f1519b
commit fcd1a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2796017487f3c1e423b8e1ada6c94c0a8ea815
+refs/heads/master: 9af28511be10e175eb0cabb2ba5cfafe77408d84
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -1520,6 +1520,8 @@ static int addrconf_ifid_infiniband(u8 *eui, struct net_device *dev)
 
 int __ipv6_isatap_ifid(u8 *eui, __be32 addr)
 {
+	if (addr == 0)
+		return -1;
 	eui[0] = (ipv4_is_zeronet(addr) || ipv4_is_private_10(addr) ||
 		  ipv4_is_loopback(addr) || ipv4_is_linklocal_169(addr) ||
 		  ipv4_is_private_172(addr) || ipv4_is_test_192(addr) ||