From bf5f7c4ff4ce5933b0e4229f814c25709c052486 Mon Sep 17 00:00:00 2001 From: vivek Date: Sun, 25 Apr 2021 22:37:48 -0700 Subject: [PATCH] zebra: Clean remote FDB entries upon VNI removal When the VLAN-VNI mapping is configured via a map and not using individual VXLAN interfaces, upon removal of a VNI ensure that the remote FDB entries are uninstalled correctly. Signed-off-by: Vivek Venkatraman Ticket: #2613048 Reviewed By: Testing Done: 1. Manual verification - logs in the ticket 2. Precommit (user job #171) and evpn-min (user job #170) --- zebra/zebra_vxlan_if.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zebra/zebra_vxlan_if.c b/zebra/zebra_vxlan_if.c index e01d06c71adc..1ab1090ae8d3 100644 --- a/zebra/zebra_vxlan_if.c +++ b/zebra/zebra_vxlan_if.c @@ -785,9 +785,14 @@ int zebra_vxlan_if_vni_table_add_update(struct interface *ifp, /* release kernel deleted vnis */ if (old_vni_table) { - if (hashcount(old_vni_table)) - hash_iterate(old_vni_table, zebra_vxlan_if_vni_clean, - zif); + if (hashcount(old_vni_table)) { + /* UGLY HACK: Put back the old table so that delete of + * MACs goes through and then flip back. + */ + vni_info->vni_table = old_vni_table; + hash_iterate(old_vni_table, zebra_vxlan_if_vni_clean, zif); + vni_info->vni_table = vni_table; + } zebra_vxlan_vni_table_destroy(old_vni_table); }