Merge branch 'master' into evpn-bug-fixes

diff --cc bgpd/bgp_evpn.c
index 9b1ff8f6a969aecc24b5ecde4c8169f7266f320c,ec8e2907a69c5b641005259c6df6f30ccbd34627..fbb2ff101d4ef303bf06b9a0526da7944f05c0ab
--- 1/bgpd/bgp_evpn.c
--- 2/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@@ -3299,8 -3274,20 +3299,20 @@@ void bgp_evpn_advertise_type5_routes(st
                 * TODO: Support for AddPath for EVPN.
                 */
                for (ri = rn->info; ri; ri = ri->next) {
 -                      if (CHECK_FLAG(ri->flags, BGP_INFO_SELECTED)) {
 +                      if (CHECK_FLAG(ri->flags, BGP_INFO_SELECTED) &&
 +                          (!ri->extra || !ri->extra->parent)) {
+ 
+                               /* apply the route-map */
+                               if (bgp_vrf->adv_cmd_rmap[afi][safi].map) {
+                                       int ret = 0;
+ 
+                                       ret =
+                                               route_map_apply(
+                                                       bgp_vrf->adv_cmd_rmap[afi][safi].map,
+                                                       &rn->p, RMAP_BGP, ri);
+                                       if (ret == RMAP_DENYMATCH)
+                                               continue;
+                               }
 -
                                bgp_evpn_advertise_type5_route(bgp_vrf, &rn->p,
                                                               ri->attr,
                                                               afi, safi);

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc zebra/zebra_vxlan.c
Simple merge