1 files changed, 13 insertions, 2 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index bd9f9360f769..86c235d05aba 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -244,6 +244,9 @@ const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
 const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
 const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
 const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
+const struct in6_addr in6addr_interfacelocal_allnodes = IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;
+const struct in6_addr in6addr_interfacelocal_allrouters = IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;
+const struct in6_addr in6addr_sitelocal_allrouters = IN6ADDR_SITELOCAL_ALLROUTERS_INIT;
 
 /* Check if a valid qdisc is available */
 static inline bool addrconf_qdisc_ok(const struct net_device *dev)
@@ -428,6 +431,9 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)
         /* protected by rtnl_lock */
         rcu_assign_pointer(dev->ip6_ptr, ndev);
 
+        /* Join interface-local all-node multicast group */
+        ipv6_dev_mc_inc(dev, &in6addr_interfacelocal_allnodes);
+
         /* Join all-node multicast group */
         ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes);
 
@@ -611,10 +617,15 @@ static void dev_forward_change(struct inet6_dev *idev)
         if (idev->cnf.forwarding)
                 dev_disable_lro(dev);
         if (dev->flags & IFF_MULTICAST) {
-                if (idev->cnf.forwarding)
+                if (idev->cnf.forwarding) {
                         ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters);
-                else
+                        ipv6_dev_mc_inc(dev, &in6addr_interfacelocal_allrouters);
+                        ipv6_dev_mc_inc(dev, &in6addr_sitelocal_allrouters);
+                } else {
                         ipv6_dev_mc_dec(dev, &in6addr_linklocal_allrouters);
+                        ipv6_dev_mc_dec(dev, &in6addr_interfacelocal_allrouters);
+                        ipv6_dev_mc_dec(dev, &in6addr_sitelocal_allrouters);
+                }
         }
 
         list_for_each_entry(ifa, &idev->addr_list, if_list) {