Commit 9625ed72 authored Apr 13, 2008 by YOSHIFUJI Hideaki Committed by David S. Miller Apr 13, 2008

[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 <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b077d7ab

net/ipv6/addrconf.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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",