Revert "bgpd: Reinstall aggregated routes if using route-maps and it was changed"

This reverts commit ee1986f1b5ae6b94b446b12e1b77cc30d8f5f46d.

The fix is incomplete, and is no longer needed with the fix that applies
the route-map for an aggregate and then compares the attribute.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 0124b12cc37c84556278c78626c232d9d68765eb..8c3b5e97ed7d24df7ce3197f34ffa888bd65bfc0 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7799,9 +7799,8 @@ static void bgp_aggregate_install(
                 * If the aggregate information has not changed
                 * no need to re-install it again.
                 */
-               if (pi && (!aggregate->rmap.changed &&
-                          bgp_aggregate_info_same(pi, origin, aspath, community,
-                                                  ecommunity, lcommunity))) {
+               if (pi && bgp_aggregate_info_same(pi, origin, aspath, community,
+                                                 ecommunity, lcommunity)) {
                        bgp_dest_unlock_node(dest);
 
                        if (aspath)
@@ -8796,7 +8795,6 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
                aggregate->rmap.name =
                        XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap);
                aggregate->rmap.map = route_map_lookup_by_name(rmap);
-               aggregate->rmap.changed = true;
                route_map_counter_increment(aggregate->rmap.map);
        }
 

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index d71bfd3ebc6247d0acccd094cdc14b095669a76f..4dcd035d793b6a1a2f86a63dbec970139656386c 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -446,7 +446,6 @@ struct bgp_aggregate {
        struct {
                char *name;
                struct route_map *map;
-               bool changed;
        } rmap;
 
        /* Suppress-count. */

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 61586ea922f528b287404e930e95bc8299caeb07..7a96f0cf6e2f34f4674759347a7102787a8322df 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -4612,7 +4612,6 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
                                        route_map_counter_increment(map);
 
                                aggregate->rmap.map = map;
-                               aggregate->rmap.changed = true;
 
                                matched = true;
                        }