[IPV6] ADDRCONF: Don't generate temporary address for ip6-ip6 interface.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Mon, 14 Apr 2008 06:47:11 +0000 (23:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2008 06:47:11 +0000 (23:47 -0700)
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 <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/addrconf.c

index b9eeb4f51d48c73a34e22d421c9b9149e66ce84f..e08955baedffc491a6fafaae378e71adb50d9e23 100644 (file)
@@ -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",