Merge pull request #11485 from AbhishekNR/ipv6_mld_todo

pim6d: Completing "ipv6 mld" config command.

diff --cc pimd/pim6_mld.c
Simple merge

diff --cc pimd/pim_addr.h
index 2f2ff246754986391f0b08198cf8c61b717f3cee,e28f121136c3fc7de3f74ba09481e96142ee4c94..defe4070cfb54697d8c3bb839f0da27118ca9370
--- 1/pimd/pim_addr.h
--- 2/pimd/pim_addr.h
+++ b/pimd/pim_addr.h
@@@ -35,9 -35,8 +35,10 @@@ typedef struct in_addr pim_addr
  #define ipaddr_pim    ipaddr_v4
  #define PIM_MAX_BITLEN        IPV4_MAX_BITLEN
  #define PIM_AF_NAME     "ip"
 +#define PIM_AF_DBG    "pim"
 +#define PIM_MROUTE_DBG  "mroute"
  #define PIMREG          "pimreg"
+ #define GM              "IGMP"
  
  #define PIM_ADDR_FUNCNAME(name) ipv4_##name
  
@@@ -61,9 -60,8 +62,10 @@@ typedef struct in6_addr pim_addr
  #define ipaddr_pim    ipaddr_v6
  #define PIM_MAX_BITLEN        IPV6_MAX_BITLEN
  #define PIM_AF_NAME     "ipv6"
 +#define PIM_AF_DBG    "pimv6"
 +#define PIM_MROUTE_DBG  "mroute6"
  #define PIMREG          "pim6reg"
+ #define GM              "MLD"
  
  #define PIM_ADDR_FUNCNAME(name) ipv6_##name
  

diff --cc pimd/pim_iface.c
index 0fb5e8c6d9f1abf305d6347d6158bebbd798921d,738a548c7c5ee05dc17bdcdad1dc8ea111a10a22..e03e5a263074da692e280217c19fc91e51780187
--- 1/pimd/pim_iface.c
--- 2/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@@ -801,16 -801,25 +799,16 @@@ void pim_if_addr_add_all(struct interfa
                pim_if_addr_add(ifc);
        }
  
 -      if (!v4_addrs && v6_addrs && !if_is_loopback(ifp)) {
 -              if (pim_ifp->pim_enable) {
 -
 -                      /* Interface has a valid primary address ? */
 -                      if (!pim_addr_is_any(pim_ifp->primary_address)) {
 -
 -                              /* Interface has a valid socket ? */
 -                              if (pim_ifp->pim_sock_fd < 0) {
 -                                      if (pim_sock_add(ifp)) {
 -                                              zlog_warn(
 -                                                      "Failure creating PIM socket for interface %s",
 -                                                      ifp->name);
 -                                      }
 -                              }
 -                      }
 -              } /* pim */
 +      if (!v4_addrs && v6_addrs && !if_is_loopback(ifp) &&
 +          pim_ifp->pim_enable && !pim_addr_is_any(pim_ifp->primary_address) &&
 +          pim_ifp->pim_sock_fd < 0 && pim_sock_add(ifp)) {
 +              /* Interface has a valid primary address ? */
 +              /* Interface has a valid socket ? */
 +              zlog_warn("Failure creating PIM socket for interface %s",
 +                        ifp->name);
        }
        /*
-        * PIM or IGMP is enabled on interface, and there is at least one
+        * PIM or IGMP/MLD is enabled on interface, and there is at least one
         * address assigned, then try to create a vif_index.
         */
        if (pim_ifp->mroute_vif_index < 0) {

diff --cc pimd/pim_nb_config.c
Simple merge

diff --cc pimd/pim_vty.c
Simple merge