]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #5653 from slankdev/slankdev-bgpd-support-prefix-sid-srv6-l3vpn
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 4 Feb 2020 16:37:10 +0000 (11:37 -0500)
committerGitHub <noreply@github.com>
Tue, 4 Feb 2020 16:37:10 +0000 (11:37 -0500)
bgpd: additional Prefix-SID sub-types for supporting SRv6 l3vpn

1  2 
bgpd/bgp_open.c
bgpd/bgp_route.c
bgpd/bgp_route.h

diff --cc bgpd/bgp_open.c
Simple merge
index d3a5774570b79695b4914ebd4ab0ae5d3696cede,e35d160197dd2e6b6355e4ccd3736a9942d4967f..66aa0da745767e61f693751474783650d0d94c79
  #include "workqueue.h"
  #include "queue.h"
  #include "memory.h"
+ #include "srv6.h"
  #include "lib/json.h"
  #include "lib_errors.h"
 -
 +#include "zclient.h"
  #include "bgpd/bgpd.h"
  #include "bgpd/bgp_table.h"
  #include "bgpd/bgp_route.h"
Simple merge