From: YOSHIFUJI Hideaki Date: Mon, 14 Apr 2008 06:47:11 +0000 (-0700) Subject: [IPV6] ADDRCONF: Don't generate temporary address for ip6-ip6 interface. X-Git-Tag: v2.6.25~33^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9625ed72e8bd619c3984f3024bd37143b7f0c7b0;p=linux-2.6-omap-h63xx.git [IPV6] ADDRCONF: Don't generate temporary address for ip6-ip6 interface. As far as I can remember, I was going to disable privacy extensions on all "tunnel" interfaces. Disable it on ip6-ip6 interface as well. Also, just remove ifdefs for SIT for simplicity. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller --- diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b9eeb4f51d4..e08955baedf 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -384,9 +384,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev); if ((dev->flags&IFF_LOOPBACK) || dev->type == ARPHRD_TUNNEL || -#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) + dev->type == ARPHRD_TUNNEL6 || dev->type == ARPHRD_SIT || -#endif dev->type == ARPHRD_NONE) { printk(KERN_INFO "%s: Disabled Privacy Extensions\n",