bgpd: Remove unused BGP_NEXTHOP_CONNECTED_CHANGED flag for nexthop

Also reduce the size of change_flags, which is way enough to be 1 byte.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 564ad118ebc3861ed7806973ba7a786ad3ca67d1..401549c4e859382929cc637911a5062e7b96a513 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -1377,16 +1377,9 @@ char *bgp_nexthop_dump_bnc_change_flags(struct bgp_nexthop_cache *bnc,
                return buf;
        }
 
-       snprintfrr(buf, len, "%s%s%s",
-                  CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED)
-                          ? "Changed "
-                          : "",
-                  CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_METRIC_CHANGED)
-                          ? "Metric "
-                          : "",
-                  CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CONNECTED_CHANGED)
-                          ? "Connected "
-                          : "");
+       snprintfrr(buf, len, "%s%s",
+                  CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED) ? "Changed " : "",
+                  CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_METRIC_CHANGED) ? "Metric " : "");
 
        return buf;
 }

diff --git a/bgpd/bgp_nexthop.h b/bgpd/bgp_nexthop.h
index 5014eb8f3455f267636e7cbc62ddcbcdd86749cf..6a4a02dcc824a9787c062e31ab3cd7f2a3cffb1f 100644 (file)
--- a/bgpd/bgp_nexthop.h
+++ b/bgpd/bgp_nexthop.h
@@ -45,11 +45,10 @@ struct bgp_nexthop_cache {
         */
        bool is_evpn_gwip_nexthop;
 
-       uint16_t change_flags;
+       uint8_t change_flags;
 #define BGP_NEXTHOP_CHANGED          (1 << 0)
 #define BGP_NEXTHOP_METRIC_CHANGED    (1 << 1)
-#define BGP_NEXTHOP_CONNECTED_CHANGED (1 << 2)
-#define BGP_NEXTHOP_MACIP_CHANGED     (1 << 3)
+#define BGP_NEXTHOP_MACIP_CHANGED     (1 << 2)
 
        struct nexthop *nexthop;
        time_t last_update;