From 96ba273e4edf6146112afcfbf0ea811cb2728b1f Mon Sep 17 00:00:00 2001 From: Enke Chen Date: Sun, 12 Jan 2025 00:27:12 -0800 Subject: [PATCH] bgpd: remove unused BATTR_REFLECTED for rmap_change_flags Remove unused BATTR_REFLECTED for rmap_change_flags. Signed-off-by: Enke Chen --- bgpd/bgp_attr.h | 1 - bgpd/bgp_route.c | 2 -- bgpd/bgp_updgrp.h | 1 - bgpd/bgp_updgrp_packet.c | 4 ---- 4 files changed, 8 deletions(-) diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h index d9fc833112..341c062510 100644 --- a/bgpd/bgp_attr.h +++ b/bgpd/bgp_attr.h @@ -323,7 +323,6 @@ struct attr { /* rmap_change_flags definition */ #define BATTR_RMAP_IPV4_NHOP_CHANGED (1 << 0) #define BATTR_RMAP_NEXTHOP_PEER_ADDRESS (1 << 1) -#define BATTR_REFLECTED (1 << 2) #define BATTR_RMAP_NEXTHOP_UNCHANGED (1 << 3) #define BATTR_RMAP_IPV6_GLOBAL_NHOP_CHANGED (1 << 4) #define BATTR_RMAP_IPV6_LL_NHOP_CHANGED (1 << 5) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 2a7ccd7ee7..7640b0bddc 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2464,8 +2464,6 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi, * announced to an EBGP peer (and they have the same attributes barring * their nexthop). */ - if (ibgp_to_ibgp) - SET_FLAG(attr->rmap_change_flags, BATTR_REFLECTED); #define NEXTHOP_IS_V6 \ ((safi != SAFI_ENCAP && safi != SAFI_MPLS_VPN \ diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h index d0fd226d99..6549c99e8f 100644 --- a/bgpd/bgp_updgrp.h +++ b/bgpd/bgp_updgrp.h @@ -66,7 +66,6 @@ typedef struct { #define BPKT_ATTRVEC_FLAGS_UPDATED (1 << 0) #define BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS (1 << 1) -#define BPKT_ATTRVEC_FLAGS_REFLECTED (1 << 2) #define BPKT_ATTRVEC_FLAGS_RMAP_NH_UNCHANGED (1 << 3) #define BPKT_ATTRVEC_FLAGS_RMAP_IPV4_NH_CHANGED (1 << 4) #define BPKT_ATTRVEC_FLAGS_RMAP_IPV6_GNH_CHANGED (1 << 5) diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 3ce136ef87..ec418f2b1d 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -1284,10 +1284,6 @@ bpacket_vec_arr_inherit_attr_flags(struct bpacket_attr_vec_arr *vecarr, SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags, BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS); - if (CHECK_FLAG(attr->rmap_change_flags, BATTR_REFLECTED)) - SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags, - BPKT_ATTRVEC_FLAGS_REFLECTED); - if (CHECK_FLAG(attr->rmap_change_flags, BATTR_RMAP_NEXTHOP_UNCHANGED)) SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags, BPKT_ATTRVEC_FLAGS_RMAP_NH_UNCHANGED);