Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2053aeb6 authored by Marius Tomaschewski's avatar Marius Tomaschewski Committed by David S. Miller
Browse files

ipv6: send only one NEWLINK when RA causes changes 



Signed-off-by: default avatarMarius Tomaschewski <mt@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c42858ea

net/ipv6/ndisc.c

+10 −3
Original line number Diff line number Diff line
@@ -1079,6 +1079,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
	int optlen;

	unsigned int pref = 0;

	__u32 old_if_flags;

	bool send_ifinfo_notify = false;



	__u8 *opt = (__u8 *)(ra_msg + 1);
@@ -1158,7 +1159,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
					IF_RA_OTHERCONF : 0);



	if (old_if_flags != in6_dev->if_flags)

		inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);

		send_ifinfo_notify = true;



	if (!in6_dev->cnf.accept_ra_defrtr) {

		ND_PRINTK(2, info,
@@ -1261,7 +1262,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
				rtime = HZ/10;

			NEIGH_VAR_SET(in6_dev->nd_parms, RETRANS_TIME, rtime);

			in6_dev->tstamp = jiffies;

			inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);

			send_ifinfo_notify = true;

		}



		rtime = ntohl(ra_msg->reachable_time);
@@ -1278,11 +1279,17 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
					      GC_STALETIME, 3 * rtime);

				in6_dev->nd_parms->reachable_time = neigh_rand_reach_time(rtime);

				in6_dev->tstamp = jiffies;

				inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);

				send_ifinfo_notify = true;

			}

		}

	}



	/*

	 *	Send a notify if RA changed managed/otherconf flags or timer settings

	 */

	if (send_ifinfo_notify)

		inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);



skip_linkparms:



	/*