From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 18 May 2017 12:05:53 +0000 (+0200)
Subject: Revert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop"
X-Git-Tag: frr-3.0-rc0~13
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=05220b6d5d9d3781654e3f36a2dbac076d709059;p=mirror%2Ffrr.git

Revert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop"

This reverts commit fa14eb2c0b408982a6634459b3afb21e9df6326a.

This was for stable/2.0 and wasn't intended to go on stable/3.0
-- my bad, missed this in the merge.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 4e00367aff..72bd081a7e 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1470,8 +1470,7 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp,
           if (!ifindex)
 	    {
 	      if (info->peer->conf_if || info->peer->ifname)
-		ifindex = ifname2ifindex_vrf (info->peer->conf_if ? info->peer->conf_if :
-                                              info->peer->ifname, bgp->vrf_id);
+		ifindex = if_nametoindex (info->peer->conf_if ? info->peer->conf_if : info->peer->ifname);
 	      else if (info->peer->nexthop.ifp)
 		ifindex = info->peer->nexthop.ifp->ifindex;
 	    }