diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2018-11-12 16:43:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 16:43:15 +0100 |
| commit | 5c5e0c0b352c75b9615d3a41714c2b0b21b67cba (patch) | |
| tree | e0fdacd66b5bb91eb8fb275e7b879a7b686c0f15 | |
| parent | Merge pull request #3276 from donaldsharp/zclient_update (diff) | |
| parent | zebra: Carry onlink if set from resolving nexthop (diff) | |
| download | frr-5c5e0c0b352c75b9615d3a41714c2b0b21b67cba.tar.xz frr-5c5e0c0b352c75b9615d3a41714c2b0b21b67cba.zip | |
Merge pull request #3289 from donaldsharp/onlink_schmonlink
zebra: Carry onlink if set from resolving nexthop
| -rw-r--r-- | zebra/zebra_rib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index d55467c72..828539252 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -358,8 +358,6 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop, if (newhop->ifindex) { resolved_hop->type = NEXTHOP_TYPE_IPV4_IFINDEX; resolved_hop->ifindex = newhop->ifindex; - if (newhop->flags & NEXTHOP_FLAG_ONLINK) - resolved_hop->flags |= NEXTHOP_FLAG_ONLINK; } break; case NEXTHOP_TYPE_IPV6: @@ -398,6 +396,9 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop, break; } + if (newhop->flags & NEXTHOP_FLAG_ONLINK) + resolved_hop->flags |= NEXTHOP_FLAG_ONLINK; + /* Copy labels of the resolved route */ if (newhop->nh_label) nexthop_add_labels(resolved_hop, newhop->nh_label_type, |