From dd50eeb11501268003148b4d445be882db12823d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 16 Apr 2019 08:37:24 -0400 Subject: [PATCH] lib, zebra: Remove unused flag The NEXTHOP_FLAG_FILTERED went away when we started treating static routes like every other route in the system. This was a special case for handling static route code that just didn't get finished cleaning up. Signed-off-by: Donald Sharp --- lib/nexthop.h | 3 +-- zebra/zebra_rib.c | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/nexthop.h b/lib/nexthop.h index 24b0953191..ad87c2e522 100644 --- a/lib/nexthop.h +++ b/lib/nexthop.h @@ -81,8 +81,7 @@ struct nexthop { #define NEXTHOP_FLAG_RECURSIVE (1 << 2) /* Recursive nexthop. */ #define NEXTHOP_FLAG_ONLINK (1 << 3) /* Nexthop should be installed onlink. */ #define NEXTHOP_FLAG_MATCHED (1 << 4) /* Already matched vs a nexthop */ -#define NEXTHOP_FLAG_FILTERED (1 << 5) /* rmap filtered, used by static only */ -#define NEXTHOP_FLAG_DUPLICATE (1 << 6) /* nexthop duplicates another active one */ +#define NEXTHOP_FLAG_DUPLICATE (1 << 5) /* nexthop duplicates another active one */ #define NEXTHOP_IS_ACTIVE(flags) \ (CHECK_FLAG(flags, NEXTHOP_FLAG_ACTIVE) \ && !CHECK_FLAG(flags, NEXTHOP_FLAG_DUPLICATE)) diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 9e91bfa784..c6ebb924dd 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -437,16 +437,6 @@ static int nexthop_active(afi_t afi, struct route_entry *re, re->type == ZEBRA_ROUTE_SYSTEM) return 1; - /* Skip nexthops that have been filtered out due to route-map */ - /* The nexthops are specific to this route and so the same */ - /* nexthop for a different route may not have this flag set */ - if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FILTERED)) { - if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug("\t%s: Nexthop Filtered", - __PRETTY_FUNCTION__); - return 0; - } - /* * Check to see if we should trust the passed in information * for UNNUMBERED interfaces as that we won't find the GW