From: Everton Marques <everton.marques@gmail.com>
Date: Tue, 23 Sep 2014 17:05:55 +0000 (-0300)
Subject: zebra_rib: Revert work-around for zebra marking recursive static route as inactive.
X-Git-Tag: frr-2.0-rc1~627
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=22afbf9446bb552637ac3670df52d04736bb88be;p=mirror%2Ffrr.git

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 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)