zebra_rib: Revert work-around for zebra marking recursive static route as inactive.

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 883fe07c1b82c0715293b074dd9533a6a90048b7..f7290caea9db827bc9853766e287e3e4d7dd0bbd 100644 (file)
--- 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)