Merge pull request #17893 from FRRouting/mergify/bp/stable/10.0/pr-17888

bgpd: Fix for local interface MAC cache issue in 'bgp mac hash' table (backport #17888)

1 files changed, 5 insertions, 2 deletions

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index a64eb35591..f9d096e6c6 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -3141,12 +3141,15 @@ static int bgp_ifp_create(struct interface *ifp)
 		zlog_debug("Rx Intf add VRF %u IF %s", ifp->vrf->vrf_id,
 			   ifp->name);
 
+	/* We don't need to check for vrf->bgp link to add this local MAC
+	 * to the hash table as the tenant VRF might not have the BGP instance.
+	 */
+	bgp_mac_add_mac_entry(ifp);
+
 	bgp = ifp->vrf->info;
 	if (!bgp)
 		return 0;
 
-	bgp_mac_add_mac_entry(ifp);
-
 	bgp_update_interface_nbrs(bgp, ifp, ifp);
 	hook_call(bgp_vrf_status_changed, bgp, ifp);
 	return 0;