From: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Date: Tue, 12 May 2020 02:10:13 +0000 (-0700)
Subject: zebra: fixup a neigh del bug introduced by a previous commit for MAC-IP sync
X-Git-Tag: base_7.6~551^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F7117%2Fhead;p=mirror%2Ffrr.git

zebra: fixup a neigh del bug introduced by a previous commit for MAC-IP sync

Problem commit -
[
b169fd6fd59ed zebra: support for MAC-IP sync routes
]

That commit had accidentally replaced a mac-ip del to bgp with a mac
del (consequence of a bad cut-paste).

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
---

diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c
index 492052b1b2..661d1c7f81 100644
--- a/zebra/zebra_evpn_neigh.c
+++ b/zebra/zebra_evpn_neigh.c
@@ -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))