]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #12646 from pguibert6WIND/mpls_alloc_per_nh
authorDonatas Abraitis <donatas@opensourcerouting.org>
Tue, 2 May 2023 15:36:45 +0000 (18:36 +0300)
committerGitHub <noreply@github.com>
Tue, 2 May 2023 15:36:45 +0000 (18:36 +0300)
MPLS allocation mode per next hop

14 files changed:
1  2 
bgpd/bgp_labelpool.c
bgpd/bgp_labelpool.h
bgpd/bgp_mplsvpn.c
bgpd/bgp_nexthop.c
bgpd/bgp_nht.c
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_vty.c
bgpd/bgp_zebra.c
bgpd/bgp_zebra.h
bgpd/bgpd.c
bgpd/bgpd.h
doc/user/bgp.rst
zebra/zebra_mpls.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgp_nht.c
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
Simple merge
Simple merge