Merge pull request #1346 from donaldsharp/apply_routemap

bgpd: Note routemap information even if peer not activated.

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index bb3def2fbe0c6464d90feb37ec7d3ca9792f098d..217916239c890c63a7002ea7a5ada7d019e19f42 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -2913,10 +2913,6 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
 
                for (afi = AFI_IP; afi < AFI_MAX; afi++)
                        for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++) {
-                               /* Ignore inactive AFI/SAFI */
-                               if (!peer->afc[afi][safi])
-                                       continue;
-
                                /* process in/out/import/export/default-orig
                                 * route-maps */
                                bgp_route_map_process_peer(rmap_name, map, peer,