From: mitesh Date: Tue, 27 Feb 2018 10:19:57 +0000 (-0800) Subject: bgpd: reassign the flags in struct bgp af_flags to avoid conflict X-Git-Tag: frr-5.0-dev~171^2~3 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2c29b18a1b327beaddabc11fd8e062310625b574;p=matthieu%2Ffrr.git bgpd: reassign the flags in struct bgp af_flags to avoid conflict We have af_flags in struct bgp which holds address family related flags. Seems like we had a conflict between two flags. Signed-off-by: Mitesh Kanjariya --- diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index bc5350ce24..43d76e5273 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -320,11 +320,11 @@ struct bgp { u_int16_t af_flags[AFI_MAX][SAFI_MAX]; #define BGP_CONFIG_DAMPENING (1 << 0) -/* l2vpn evpn flags */ -#define BGP_L2VPN_EVPN_ADVERTISE_IPV4_UNICAST (1 << 0) -#define BGP_L2VPN_EVPN_ADVERTISE_IPV6_UNICAST (1 << 1) -#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV4 (1 << 2) -#define BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV6 (1 << 3) +/* 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) /* Route table for next-hop lookup cache. */