summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEverton Marques <everton.marques@gmail.com>2014-09-23 14:05:55 -0300
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-05-29 20:59:38 -0400
commit22afbf9446bb552637ac3670df52d04736bb88be (patch)
treeae4d5bc0154caf39afa4eed1930a27b2edd98453
parent8f26ef2c687713562dd105386a56bc2b34f5b1a0 (diff)
zebra_rib: Revert work-around for zebra marking recursive static route as inactive.
-rw-r--r--zebra/zebra_rib.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 883fe07c1b..f7290caea9 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -436,13 +436,7 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
return 1;
}
- else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL) ||
- match->type == ZEBRA_ROUTE_KERNEL)
- /*
- || match->type == ZEBRA_ROUTE_KERNEL
- This prevents zebra from marking recursive static route as inactive.
- See pimd/TODO T26.
- */
+ else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL))
{
resolved = 0;
for (newhop = match->nexthop; newhop; newhop = newhop->next)