From 58c8bd05603de64c864dbbbb64502b80d5290f26 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sun, 13 Apr 2008 23:42:18 -0700
Subject: [PATCH] --- yaml --- r: 88319 b: refs/heads/master c:
 b077d7ababdb5433aef18c62bf1f785e8729f49a h: refs/heads/master i:   88317:
 e7582f93d7ef211f08814dc2dbd97f0994db9b99   88315:
 30e1c19be1652f757679cf4a42850afc622a237b   88311:
 efcd1def57beb3a6818781d0fa99a46c80f9f09e   88303:
 2edba1bb26aa0eb35b9d14777a0242591228dbd0   88287:
 836461a74651c1d0fabc9918c1bf06ac1f8a7cf1   88255:
 12de798c3944928ed8dae9e5dba774deb3305583   88191:
 4dc3125d74f3dfb5af7f365fbcb4cc5d50148ed7   88063:
 6c3bac09bdab7d7df7970dac181ffd519b6b0c38 v: v3

---
 [refs]                    |  2 +-
 trunk/net/ipv6/addrconf.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 73ce17f4b55e..ff613f127670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9df2e8fd8fbc95c57dbd1d33dada66c4627b44c
+refs/heads/master: b077d7ababdb5433aef18c62bf1f785e8729f49a
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index a65935a9afd9..b9eeb4f51d48 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -371,6 +371,15 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
 	 */
 	in6_dev_hold(ndev);
 
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
+	if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) {
+		printk(KERN_INFO
+		       "%s: Disabled Multicast RS\n",
+		       dev->name);
+		ndev->cnf.rtr_solicits = 0;
+	}
+#endif
+
 #ifdef CONFIG_IPV6_PRIVACY
 	setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev);
 	if ((dev->flags&IFF_LOOPBACK) ||
@@ -383,13 +392,6 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
 		       "%s: Disabled Privacy Extensions\n",
 		       dev->name);
 		ndev->cnf.use_tempaddr = -1;
-
-		if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) {
-			printk(KERN_INFO
-			       "%s: Disabled Multicast RS\n",
-			       dev->name);
-			ndev->cnf.rtr_solicits = 0;
-		}
 	} else {
 		in6_dev_hold(ndev);
 		ipv6_regen_rndid((unsigned long) ndev);