Merge pull request #7483 from AnuradhaKaruppiah/evpn-mh-dad

bgpd, zebra: Keep DAD disabled if EVPN MH is turned on

diff --cc zebra/zebra_evpn_mh.c
index b08adc5541189fbd6ff3e9f61cc8cf6d5f51722c,93b7823d5717554f19bba608df8625e9afe66c08..4ecff1aee3f6fd4c35e492dafefd73b00692c795
--- 1/zebra/zebra_evpn_mh.c
--- 2/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@@ -1665,9 -1697,11 +1695,11 @@@ static void zebra_evpn_es_local_info_se
                return;
  
        if (IS_ZEBRA_DEBUG_EVPN_MH_ES)
 -              zlog_debug("local es %s add; nhg 0x%x if %s",
 -                              es->esi_str, es->nhg_id, zif->ifp->name);
 +              zlog_debug("local es %s add; nhg %u if %s", es->esi_str,
 +                         es->nhg_id, zif->ifp->name);
  
+       zebra_evpn_mh_dup_addr_detect_off();
+ 
        es->flags |= ZEBRA_EVPNES_LOCAL;
        listnode_init(&es->local_es_listnode, es);
        listnode_add(zmh_info->local_es_list, &es->local_es_listnode);