From 305d792b65f808fe23b8d1f8edc4fae978c0d139 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Sun, 13 Apr 2008 23:47:11 -0700 Subject: [PATCH] --- yaml --- r: 88320 b: refs/heads/master c: 9625ed72e8bd619c3984f3024bd37143b7f0c7b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/addrconf.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff613f127670..8936701342a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b077d7ababdb5433aef18c62bf1f785e8729f49a +refs/heads/master: 9625ed72e8bd619c3984f3024bd37143b7f0c7b0 diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index b9eeb4f51d48..e08955baedff 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/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",