From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 31 Jan 2017 12:36:57 +0000 (-0500)
Subject: zebra: Do not force NEXTHOP_TYPE to XXX_IFINDEX
X-Git-Tag: frr-3.0-branchpoint~60^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6bcc7f4b7ed40169802404c22bb619665730d5fa;p=mirror%2Ffrr.git

zebra: Do not force NEXTHOP_TYPE to XXX_IFINDEX

The original goal of the zebra change was to force all:
NEXTHOP_TYPE_IPV4 -> NEXTHOP_TYPE_IPV4_IFINDEX
NEXTHOP_TYPE_IPV6 -> NEXTHOP_TYPE_IPV6_IFINDEX

This causes issues in routes being installed into the kernel
backing this out until I can get time to fully understand
what is going wrong.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 7faf4c7e04..c1c1f897a1 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -471,16 +471,9 @@ nexthop_active (afi_t afi, struct rib *rib, struct nexthop *nexthop, int set,
 	      newhop = match->nexthop;
 	      if (newhop)
 		{
-		  if (nexthop->type == NEXTHOP_TYPE_IPV4)
-		    {
-		      nexthop->ifindex = newhop->ifindex;
-		      nexthop->type = NEXTHOP_TYPE_IPV4;
-		    }
-		  if (nexthop->type == NEXTHOP_TYPE_IPV6)
-		    {
-		      nexthop->ifindex = newhop->ifindex;
-		      nexthop->type = NEXTHOP_TYPE_IPV6_IFINDEX;
-		    }
+                  if (nexthop->type == NEXTHOP_TYPE_IPV4 ||
+                      nexthop->type == NEXTHOP_TYPE_IPV6)
+                    nexthop->ifindex = newhop->ifindex;
 		}
 	      return 1;
 	    }