aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-14 02:47:11 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-14 02:47:11 -0400
commit9625ed72e8bd619c3984f3024bd37143b7f0c7b0 (patch)
treec3952ee1350f84cce42ab7e235c1ce33a587acd6
parentb077d7ababdb5433aef18c62bf1f785e8729f49a (diff)
[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>
-rw-r--r--net/ipv6/addrconf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b9eeb4f51d48..e08955baedff 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)
384 setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev); 384 setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev);
385 if ((dev->flags&IFF_LOOPBACK) || 385 if ((dev->flags&IFF_LOOPBACK) ||
386 dev->type == ARPHRD_TUNNEL || 386 dev->type == ARPHRD_TUNNEL ||
387#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) 387 dev->type == ARPHRD_TUNNEL6 ||
388 dev->type == ARPHRD_SIT || 388 dev->type == ARPHRD_SIT ||
389#endif
390 dev->type == ARPHRD_NONE) { 389 dev->type == ARPHRD_NONE) {
391 printk(KERN_INFO 390 printk(KERN_INFO
392 "%s: Disabled Privacy Extensions\n", 391 "%s: Disabled Privacy Extensions\n",