From: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
Date: Tue, 27 Feb 2018 09:46:26 +0000 (-0800)
Subject: Merge branch 'master' into type5-default-originate
X-Git-Tag: frr-5.0-dev~171^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=23e386ac714b48872d7d41ad118b12ebbc22984c;p=matthieu%2Ffrr.git

Merge branch 'master' into type5-default-originate
---

23e386ac714b48872d7d41ad118b12ebbc22984c
diff --cc bgpd/bgpd.h
index 274ca82ffc,91a9f11620..bc5350ce24
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@@ -438,9 -431,12 +438,11 @@@ struct bgp 
  	/* vrf flags */
  	uint32_t vrf_flags;
  #define BGP_VRF_AUTO                        (1 << 0)
 -#define BGP_VRF_ADVERTISE_IPV4_IN_EVPN      (1 << 1)
 -#define BGP_VRF_ADVERTISE_IPV6_IN_EVPN      (1 << 2)
 -#define BGP_VRF_IMPORT_RT_CFGD              (1 << 3)
 -#define BGP_VRF_EXPORT_RT_CFGD              (1 << 4)
 -#define BGP_VRF_RD_CFGD                     (1 << 5)
 -#define BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY    (1 << 6)
 +#define BGP_VRF_IMPORT_RT_CFGD              (1 << 1)
 +#define BGP_VRF_EXPORT_RT_CFGD              (1 << 2)
 +#define BGP_VRF_RD_CFGD                     (1 << 3)
++#define BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY    (1 << 4)
++
  
  	/* unique ID for auto derivation of RD for this vrf */
  	uint16_t vrf_rd_id;