ipv6: send only one NEWLINK when RA causes changes
Subsystems (3)
PATCH 1/1 ipv6: send only one NEWLINK when RA causes changes
Signed-off-by Marius Tomaschewski <[email protected]>
net/ipv6/ndisc.c +10 -3
@@ -1075,6 +1075,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 );
@@ -1154,7 +1155,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,
@@ -1259,7 +1260,7 @@ skip_defrtr: 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);
@@ -1276,11 +1277,17 @@ skip_defrtr: 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:/*
Signature · 1 line
2.1.4
From: Marius Tomaschewski <[email protected]>
Date: Tue, 1 Sep 2015 01:57:30 +0200
Quoted 1 line
Signed-off-by Marius Tomaschewski <[email protected]>
Applied, thanks.
I wonder what to do about the situations right before the first assignment of send_ifinfo_notify to true where the dst_neigh_lookup() fails.
Since we updated if_flags, we probably should still emit the notification.