diff options
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_route.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_route.h | 1 | ||||
| -rw-r--r-- | bgpd/bgp_routemap.c | 1 | 
3 files changed, 2 insertions, 6 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 12397e87e3..3e6c846c17 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7718,9 +7718,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) @@ -8712,7 +8711,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 efabbc7980..ffae6995fe 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -432,7 +432,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 aab04cb277..261b7d240c 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -4616,7 +4616,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;  			}  | 
