Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b077d7ab authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6] ADDRCONF: Ensure disabling multicast RS even if privacy extensions are disabled. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9df2e8f

net/ipv6/addrconf.c

+9 −7
Original line number Diff line number Diff line
@@ -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);