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 <sharpd@cumulusnetworks.com>

diff --git a/lib/nexthop.h b/lib/nexthop.h
index 24b0953191efb74071c4a8e91f6f81ed87be8bfe..ad87c2e522a48bc07e0ac4c909a2095357fe0309 100644 (file)
--- 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 9e91bfa784eaf400f66bc7a43d5facf430c955cf..c6ebb924dde88bc3fe5a4879a9a0ad6f8d45b311 100644 (file)
--- 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