From: Donald Sharp <donaldsharp72@gmail.com>
Date: Wed, 19 Feb 2025 16:22:03 +0000 (-0500)
Subject: Revert "bgpd: release manual vpn label on instance deletion (backport #18121)"
X-Git-Tag: docker/10.2.2~11^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=95cd00448d05eb53803a733a415155492b699894;p=matthieu%2Ffrr.git

Revert "bgpd: release manual vpn label on instance deletion (backport #18121)"
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 16dbae4f17..0601400afd 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4046,37 +4046,6 @@ int bgp_delete(struct bgp *bgp)
 
 	bgp_vpn_leak_unimport(bgp);
 
-<<<<<<< HEAD
-=======
-	/*
-	 * Release SRv6 SIDs, like it's done in `vpn_leak_postchange()`
-	 * and bgp_sid_vpn_export_cmd/af_sid_vpn_export_cmd commands.
-	 */
-	bgp->tovpn_sid_index = 0;
-	UNSET_FLAG(bgp->vrf_flags, BGP_VRF_TOVPN_SID_AUTO);
-	delete_vrf_tovpn_sid_per_vrf(bgp_default, bgp);
-	for (afi = AFI_IP; afi < AFI_MAX; afi++) {
-		bgp->vpn_policy[afi].tovpn_sid_index = 0;
-		UNSET_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_AUTO);
-		delete_vrf_tovpn_sid_per_af(bgp_default, bgp, afi);
-
-		vpn_leak_zebra_vrf_sid_withdraw(bgp, afi);
-	}
-
-	/* release auto vpn labels */
-	bgp_vpn_release_label(bgp, AFI_IP, true);
-	bgp_vpn_release_label(bgp, AFI_IP6, true);
-
-	/* release manual vpn labels */
-	for (afi = AFI_IP; afi < AFI_MAX; afi++) {
-		if (!CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_LABEL_MANUAL_REG))
-			continue;
-		bgp_zebra_release_label_range(bgp->vpn_policy[afi].tovpn_label,
-					      bgp->vpn_policy[afi].tovpn_label);
-		UNSET_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_LABEL_MANUAL_REG);
-	}
-
->>>>>>> d6363625c (bgpd: release manual vpn label on instance deletion)
 	hook_call(bgp_inst_delete, bgp);
 
 	FOREACH_AFI_SAFI (afi, safi)