diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2025-02-19 13:08:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-19 13:08:09 -0600 |
| commit | f6cbcb0b1e5e6a74927263c27454185844a2455c (patch) | |
| tree | 70d9cf9d1d2fd32de66dcc84519e2dcf6d3e0f30 | |
| parent | 68c5627c42c61f49b34d72dca3a3e14108e4fb9c (diff) | |
| parent | a565a8eb07726b52527567e254c0362cb905a423 (diff) | |
Merge pull request #18201 from FRRouting/revert-18156-mergify/bp/stable/10.1/pr-18121
Revert "bgpd: release manual vpn label on instance deletion (backport #18121)"
| -rw-r--r-- | bgpd/bgpd.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index e8440ec9c0..a984c5af87 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3959,37 +3959,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) |