diff options
| author | Mitesh Kanjariya <mitesh@marvel-07.cumulusnetworks.com> | 2018-03-26 01:55:28 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-04-25 12:39:16 -0400 |
| commit | f4882003c6331b6f230ca67ab3b48357204d7abc (patch) | |
| tree | 277747f033beb64d889ab24db8b3bcde11cfbb05 | |
| parent | 6e2c7fe69d3ef8a99e863adcb8549fb0fc6ecbf8 (diff) | |
bgpd: resolve flag definition confict for af_flags under bgp vrf
afi/safi flags defined under bgp vrf needs to be unique across afi/safi.
Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
| -rw-r--r-- | bgpd/bgpd.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 472c805632..b2f460e51f 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -346,17 +346,18 @@ struct bgp { /* BGP Per AF flags */ uint16_t af_flags[AFI_MAX][SAFI_MAX]; -#define BGP_CONFIG_DAMPENING (1 << 0) -#define BGP_CONFIG_VRF_TO_MPLSVPN_EXPORT (1 << 1) -#define BGP_CONFIG_MPLSVPN_TO_VRF_IMPORT (1 << 2) -#define BGP_CONFIG_VRF_TO_VRF_IMPORT (1 << 3) -#define BGP_CONFIG_VRF_TO_VRF_EXPORT (1 << 4) - +#define BGP_CONFIG_DAMPENING (1 << 0) /* l2vpn evpn flags - 1 << 0 is used for DAMPENNG */ -#define BGP_L2VPN_EVPN_ADVERTISE_IPV4_UNICAST (1 << 1) -#define BGP_L2VPN_EVPN_ADVERTISE_IPV6_UNICAST (1 << 2) -#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV4 (1 << 3) -#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV6 (1 << 4) +#define BGP_L2VPN_EVPN_ADVERTISE_IPV4_UNICAST (1 << 1) +#define BGP_L2VPN_EVPN_ADVERTISE_IPV6_UNICAST (1 << 2) +#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV4 (1 << 3) +#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV6 (1 << 4) +/* import/export between address families */ +#define BGP_CONFIG_VRF_TO_MPLSVPN_EXPORT (1 << 5) +#define BGP_CONFIG_MPLSVPN_TO_VRF_IMPORT (1 << 6) +/* vrf-route leaking flags */ +#define BGP_CONFIG_VRF_TO_VRF_IMPORT (1 << 7) +#define BGP_CONFIG_VRF_TO_VRF_EXPORT (1 << 8) /* Route table for next-hop lookup cache. */ |