summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_nexthop.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2023-05-03 12:50:26 +0200
committerDonatas Abraitis <donatas@opensourcerouting.org>2023-05-03 12:52:46 +0200
commit786e2b8bdb5e06e1d5125855c1a719802f178de1 (patch)
tree7a65648e35bf158574ffa5d189ecb07933419c9a /bgpd/bgp_nexthop.c
parentMerge pull request #13422 from donaldsharp/pim_thread_off_fix (diff)
downloadfrr-786e2b8bdb5e06e1d5125855c1a719802f178de1.tar.xz
frr-786e2b8bdb5e06e1d5125855c1a719802f178de1.zip
Revert "MPLS allocation mode per next hop"
Broken tests, let's revert now. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_nexthop.c')
-rw-r--r--bgpd/bgp_nexthop.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index c87851238..1c79d7d03 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -31,7 +31,6 @@
#include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_vty.h"
#include "bgpd/bgp_rd.h"
-#include "bgpd/bgp_mplsvpn.h"
DEFINE_MTYPE_STATIC(BGPD, MARTIAN_STRING, "BGP Martian Addr Intf String");
@@ -120,8 +119,6 @@ static void bgp_nexthop_cache_reset(struct bgp_nexthop_cache_head *tree)
while (!LIST_EMPTY(&(bnc->paths))) {
struct bgp_path_info *path = LIST_FIRST(&(bnc->paths));
- bgp_mplsvpn_path_nh_label_unlink(path);
-
path_nh_map(path, bnc, false);
}