Merge pull request #7117 from AnuradhaKaruppiah/mh-macip-fixes

zebra: fixup a neigh del bug introduced by a previous commit for EVPN-MH MAC-IP sync
This commit is contained in:
Rafael Zalamena 2020-09-17 07:03:36 -03:00 committed by GitHub
commit 1d03dd3527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2184,9 +2184,10 @@ void process_neigh_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
seq, n->flags);
zebra_evpn_neigh_clear_sync_info(n);
if (IS_ZEBRA_NEIGH_ACTIVE(n))
zebra_evpn_mac_send_del_to_client(
zevpn->vni, &mac->macaddr,
mac->flags, false /*force*/);
zebra_evpn_neigh_send_del_to_client(
zevpn->vni, &n->ip, &n->emac,
n->flags, n->state,
false /*force*/);
}
if (memcmp(&n->emac, &mac->macaddr,
sizeof(struct ethaddr))