Commit c60e06c3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'igmp-fix-two-incorrect-unsolicit-report-count-issues' 



Hangbin Liu says:

====================
igmp: fix two incorrect unsolicit report count issues

Just like the subject, fix two minor igmp unsolicit report count issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93bbadd6 ff06525f

net/ipv4/igmp.c

+4 −7
Original line number Diff line number Diff line
@@ -820,10 +820,9 @@ static void igmp_timer_expire(struct timer_list *t) 
	spin_lock(&im->lock);

	im->tm_running = 0;



	if (im->unsolicit_count) {

		im->unsolicit_count--;

	if (im->unsolicit_count && --im->unsolicit_count)

		igmp_start_timer(im, unsolicited_report_interval(in_dev));

	}



	im->reporter = 1;

	spin_unlock(&im->lock);
@@ -1308,6 +1307,8 @@ static void igmp_group_added(struct ip_mc_list *im) 


	if (in_dev->dead)

		return;



	im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;

	if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev)) {

		spin_lock_bh(&im->lock);

		igmp_start_timer(im, IGMP_INITIAL_REPORT_DELAY);
@@ -1391,9 +1392,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr, 
			      unsigned int mode)

{

	struct ip_mc_list *im;

#ifdef CONFIG_IP_MULTICAST

	struct net *net = dev_net(in_dev->dev);

#endif



	ASSERT_RTNL();
@@ -1420,7 +1418,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr, 
	spin_lock_init(&im->lock);

#ifdef CONFIG_IP_MULTICAST

	timer_setup(&im->timer, igmp_timer_expire, 0);

	im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;

#endif



	im->next_rcu = in_dev->mc_list;