Merge pull request #17099 from opensourcerouting/fix/remove_BGP_NEXTHOP_CONNECTED_CHANGED

bgpd: Remove unused BGP_NEXTHOP_CONNECTED_CHANGED flag for nexthop
This commit is contained in:
Mark Stapp 2024-10-15 08:24:22 -04:00 committed by GitHub
commit 8936108769
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 13 deletions

View File

@ -1377,16 +1377,9 @@ char *bgp_nexthop_dump_bnc_change_flags(struct bgp_nexthop_cache *bnc,
return buf; return buf;
} }
snprintfrr(buf, len, "%s%s%s", snprintfrr(buf, len, "%s%s",
CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED) CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED) ? "Changed " : "",
? "Changed " CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_METRIC_CHANGED) ? "Metric " : "");
: "",
CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_METRIC_CHANGED)
? "Metric "
: "",
CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CONNECTED_CHANGED)
? "Connected "
: "");
return buf; return buf;
} }

View File

@ -45,11 +45,10 @@ struct bgp_nexthop_cache {
*/ */
bool is_evpn_gwip_nexthop; bool is_evpn_gwip_nexthop;
uint16_t change_flags; uint8_t change_flags;
#define BGP_NEXTHOP_CHANGED (1 << 0) #define BGP_NEXTHOP_CHANGED (1 << 0)
#define BGP_NEXTHOP_METRIC_CHANGED (1 << 1) #define BGP_NEXTHOP_METRIC_CHANGED (1 << 1)
#define BGP_NEXTHOP_CONNECTED_CHANGED (1 << 2) #define BGP_NEXTHOP_MACIP_CHANGED (1 << 2)
#define BGP_NEXTHOP_MACIP_CHANGED (1 << 3)
struct nexthop *nexthop; struct nexthop *nexthop;
time_t last_update; time_t last_update;