From fcd1a4154c5d8112e9053dc5a511b46c713e97b5 Mon Sep 17 00:00:00 2001 From: Sascha Hlusiak Date: Tue, 19 May 2009 12:56:51 +0000 Subject: [PATCH] --- yaml --- r: 150337 b: refs/heads/master c: 9af28511be10e175eb0cabb2ba5cfafe77408d84 h: refs/heads/master i: 150335: 8973956fb948db793a75c86567acf4d9fb426a0f v: v3 --- [refs] | 2 +- trunk/net/ipv6/addrconf.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e57ee422ff44..8c88367b983a 100644 --- 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 index 9eb61c7cae57..31938e5fb220 100644 --- 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) ||