|
@@ -1307,6 +1307,8 @@ static void igmp_group_added(struct ip_mc_list *im)
|
|
|
|
|
|
|
|
if (in_dev->dead)
|
|
if (in_dev->dead)
|
|
|
return;
|
|
return;
|
|
|
|
|
+
|
|
|
|
|
+ im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;
|
|
|
if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev)) {
|
|
if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev)) {
|
|
|
spin_lock_bh(&im->lock);
|
|
spin_lock_bh(&im->lock);
|
|
|
igmp_start_timer(im, IGMP_INITIAL_REPORT_DELAY);
|
|
igmp_start_timer(im, IGMP_INITIAL_REPORT_DELAY);
|
|
@@ -1390,9 +1392,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
|
|
|
unsigned int mode)
|
|
unsigned int mode)
|
|
|
{
|
|
{
|
|
|
struct ip_mc_list *im;
|
|
struct ip_mc_list *im;
|
|
|
-#ifdef CONFIG_IP_MULTICAST
|
|
|
|
|
- struct net *net = dev_net(in_dev->dev);
|
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
@@ -1419,7 +1418,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
|
|
|
spin_lock_init(&im->lock);
|
|
spin_lock_init(&im->lock);
|
|
|
#ifdef CONFIG_IP_MULTICAST
|
|
#ifdef CONFIG_IP_MULTICAST
|
|
|
timer_setup(&im->timer, igmp_timer_expire, 0);
|
|
timer_setup(&im->timer, igmp_timer_expire, 0);
|
|
|
- im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
im->next_rcu = in_dev->mc_list;
|
|
im->next_rcu = in_dev->mc_list;
|