Attachment #107087 for bug #161907

Lines 341-346 void in6_dev_finish_destroy(struct inet6_dev *idev) Link Here

(-)a/net/ipv6/addrconf.c (+6 lines)
341	static struct inet6_dev * ipv6_add_dev(struct net_device *dev)	341	static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
342	{	342	{
343	struct inet6_dev *ndev;	343	struct inet6_dev *ndev;
		344	struct in6_addr maddr;
344		345
345	ASSERT_RTNL();	346	ASSERT_RTNL();
346		347
Lines 425-430 static struct inet6_dev * ipv6_add_dev(struct net_device *dev) Link Here
425	#endif	426	#endif
426	/* protected by rtnl_lock */	427	/* protected by rtnl_lock */
427	rcu_assign_pointer(dev->ip6_ptr, ndev);	428	rcu_assign_pointer(dev->ip6_ptr, ndev);
		429
		430	/* Join all-node multicast group */
		431	ipv6_addr_all_nodes(&maddr);
		432	ipv6_dev_mc_inc(dev, &maddr);
		433
428	return ndev;	434	return ndev;
429	}	435	}
430		436





void ipv6_mc_init_dev(struct inet6_dev *idev)
{
	struct in6_addr maddr;

	write_lock_bh(&idev->lock);
	rwlock_init(&idev->mc_lock);
	idev->mc_gq_running = 0;

	idev->mc_maxdelay = IGMP6_UNSOLICITED_IVAL;
	idev->mc_v1_seen = 0;
	write_unlock_bh(&idev->lock);

	/* Add all-nodes address. */
	ipv6_addr_all_nodes(&maddr);
	ipv6_dev_mc_inc(idev->dev, &maddr);
}

/*

Return to bug 161907

Lines 2258-2265 void ipv6_mc_up(struct inet6_dev *idev) Link Here

(-)a/net/ipv6/mcast.c (-6 lines)
2258		2258
2259	void ipv6_mc_init_dev(struct inet6_dev *idev)	2259	void ipv6_mc_init_dev(struct inet6_dev *idev)
2260	{	2260	{
2261	struct in6_addr maddr;
2262
2263	write_lock_bh(&idev->lock);	2261	write_lock_bh(&idev->lock);
2264	rwlock_init(&idev->mc_lock);	2262	rwlock_init(&idev->mc_lock);
2265	idev->mc_gq_running = 0;	2263	idev->mc_gq_running = 0;
Lines 2275-2284 void ipv6_mc_init_dev(struct inet6_dev *idev) Link Here
2275	idev->mc_maxdelay = IGMP6_UNSOLICITED_IVAL;	2273	idev->mc_maxdelay = IGMP6_UNSOLICITED_IVAL;
2276	idev->mc_v1_seen = 0;	2274	idev->mc_v1_seen = 0;
2277	write_unlock_bh(&idev->lock);	2275	write_unlock_bh(&idev->lock);
2278
2279	/* Add all-nodes address. */
2280	ipv6_addr_all_nodes(&maddr);
2281	ipv6_dev_mc_inc(idev->dev, &maddr);
2282	}	2276	}
2283		2277
2284	/*	2278	/*