diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 14:05:53 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 14:05:53 +0200 |
| commit | 05220b6d5d9d3781654e3f36a2dbac076d709059 (patch) | |
| tree | 43e8b5cc800d473fe1ea88ecb761f13e4b49d8c8 /bgpd | |
| parent | Merge pull request #512 from bingen/tmp_lm_relay_async (diff) | |
| download | frr-05220b6d5d9d3781654e3f36a2dbac076d709059.tar.xz frr-05220b6d5d9d3781654e3f36a2dbac076d709059.zip | |
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>
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_zebra.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 4e00367af..72bd081a7 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; } |