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>

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 472c8056326952a7dae89cb12b2b29ceb46bcb92..b2f460e51f1f9c0e21a66b8eef6c055846641410 100644 (file)
--- 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. */