ipv6: send only one NEWLINK when RA causes changes

Signed-off-by: Marius Tomaschewski <mt@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 12fff091e0439d29fe3dcaa707e40bafda40f212..64a71354b069dd816199d1b1e23fe78082f2406a 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -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 @@ 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);
@@ -1278,11 +1279,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:
 
        /*