Commit 9ba2add3 authored by Shmulik Ladkani's avatar Shmulik Ladkani Committed by David S. Miller

ipv6: Make 'addrconf_rs_timer' send Router Solicitations (and re-arm itself)...

ipv6: Make 'addrconf_rs_timer' send Router Solicitations (and re-arm itself) if Router Advertisements are accepted

As of 026359bc [ipv6: Send ICMPv6 RSes only when RAs are accepted],
Router Solicitations are sent whenever kernel accepts Router
Advertisements on the interface.

However, this logic isn't reflected in 'addrconf_rs_timer'.

The timer fails to issue subsequent RS messages (and fails to re-arm
itself) if forwarding is enabled and the special hybrid mode is
enabled (accept_ra=2).

Fix the condition determining whether next RS should be sent, by using
Reported-by: default avatarAmi Koren <>
Signed-off-by: default avatarShmulik Ladkani <>
Signed-off-by: default avatarDavid S. Miller <>
parent 1c85382e
......@@ -2988,7 +2988,7 @@ static void addrconf_rs_timer(unsigned long data)
if (idev->dead || !(idev->if_flags & IF_READY))
goto out;
if (idev->cnf.forwarding)
if (!ipv6_accept_ra(idev))
goto out;
/* Announcement received after solicitation was sent */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment