diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-06 22:19:24 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-06 22:19:24 +0000 |
| commit | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (patch) | |
| tree | dfb478c984f1aeb74f0c35c9c7b8b11577cb9833 /zebra/zebra_rib.c | |
| parent | 558283638bb50ff24ea28bab89c1bb4c89ccc3dd (diff) | |
| parent | defd0965f4a85a392e29032f712617e3c617596d (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
zebra/zserv.c
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index cc4888f3e7..10e5f55e05 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -520,7 +520,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re, nexthop->ifindex = newhop->ifindex; } return 1; - } else if (CHECK_FLAG(re->flags, ZEBRA_FLAG_INTERNAL)) { + } else if (CHECK_FLAG(re->flags, ZEBRA_FLAG_ALLOW_RECURSION)) { resolved = 0; for (ALL_NEXTHOPS(match->nexthop, newhop)) { if (!CHECK_FLAG(newhop->flags, |