Commit 6c6da928 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

ipv6: mcast: fix unsolicited report interval after receiving querys 



After recieving MLD querys, we update idev->mc_maxdelay with max_delay
from query header. This make the later unsolicited reports have the same
interval with mc_maxdelay, which means we may send unsolicited reports with
long interval time instead of default configured interval time.

Also as we will not call ipv6_mc_reset() after device up. This issue will
be there even after leave the group and join other groups.

Fixes: fc4eba58 ("ipv6: make unsolicited report intervals configurable for mld")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8f1f658

net/ipv6/mcast.c

+6 −3
Original line number Diff line number Diff line
@@ -2082,7 +2082,8 @@ void ipv6_mc_dad_complete(struct inet6_dev *idev) 
		mld_send_initial_cr(idev);

		idev->mc_dad_count--;

		if (idev->mc_dad_count)

			mld_dad_start_timer(idev, idev->mc_maxdelay);

			mld_dad_start_timer(idev,

					    unsolicited_report_interval(idev));

	}

}
@@ -2094,7 +2095,8 @@ static void mld_dad_timer_expire(struct timer_list *t) 
	if (idev->mc_dad_count) {

		idev->mc_dad_count--;

		if (idev->mc_dad_count)

			mld_dad_start_timer(idev, idev->mc_maxdelay);

			mld_dad_start_timer(idev,

					    unsolicited_report_interval(idev));

	}

	in6_dev_put(idev);

}
@@ -2452,7 +2454,8 @@ static void mld_ifc_timer_expire(struct timer_list *t) 
	if (idev->mc_ifc_count) {

		idev->mc_ifc_count--;

		if (idev->mc_ifc_count)

			mld_ifc_start_timer(idev, idev->mc_maxdelay);

			mld_ifc_start_timer(idev,

					    unsolicited_report_interval(idev));

	}

	in6_dev_put(idev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE