Merge branch 'master' into type5-default-originate

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_evpn.h
index 3a3ffeb2933619073fa72d32f5a5bd1ebe459b1b,bf6150e6480154503bed691fa592368839830898..7c0d638327b546f0ee828059d640e029722239d4
--- 1/bgpd/bgp_evpn.h
--- 2/bgpd/bgp_evpn.h
+++ b/bgpd/bgp_evpn.h
@@@ -55,31 -55,11 +55,30 @@@ static inline vni_t label2vni(mpls_labe
        return vni;
  }
  
 +static inline int advertise_type5_routes(struct bgp *bgp_vrf,
 +                                       afi_t afi)
 +{
 +      if (!bgp_vrf->l3vni)
 +              return 0;
 +
 +      if (afi == AFI_IP &&
 +          CHECK_FLAG(bgp_vrf->af_flags[AFI_L2VPN][SAFI_EVPN],
 +                     BGP_L2VPN_EVPN_ADVERTISE_IPV4_UNICAST))
 +              return 1;
 +
 +      if (afi == AFI_IP6 &&
 +          CHECK_FLAG(bgp_vrf->af_flags[AFI_L2VPN][SAFI_EVPN],
 +                     BGP_L2VPN_EVPN_ADVERTISE_IPV6_UNICAST))
 +              return 1;
 +
 +      return 0;
 +}
 +
  extern void bgp_evpn_advertise_type5_route(struct bgp *bgp_vrf,
                                           struct prefix *p,
-                                          struct attr *src_attr,
-                                          afi_t afi, safi_t safi);
- extern void bgp_evpn_withdraw_type5_route(struct bgp *bgp_vrf,
-                                         struct prefix *p,
+                                          struct attr *src_attr, afi_t afi,
+                                          safi_t safi);
+ extern void bgp_evpn_withdraw_type5_route(struct bgp *bgp_vrf, struct prefix *p,
                                          afi_t afi, safi_t safi);
  extern void bgp_evpn_withdraw_type5_routes(struct bgp *bgp_vrf, afi_t afi,
                                           safi_t safi);

diff --cc bgpd/bgp_evpn_private.h
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge