diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2020-02-27 18:43:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 18:43:59 -0500 |
| commit | f16e992d37f670ea4812c950e3f3d29e7f019b03 (patch) | |
| tree | 1fa614cd6e3aaad1b237b159be2b48dfa7282d3b /zebra/zebra_dplane.c | |
| parent | 93b568451d3af4228376f82a253fa71a964fb091 (diff) | |
| parent | c415d89528f5cd7128e5b4c4cd65cce01d64fc80 (diff) | |
Merge pull request #5857 from mjstapp/embed_nhg_in_nhe
zebra,lib: Embed lib nexthop-group in zebra hash entry
Diffstat (limited to 'zebra/zebra_dplane.c')
| -rw-r--r-- | zebra/zebra_dplane.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 17b148178f..5d0d0a48c3 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -1513,9 +1513,9 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx, /* Copy nexthops; recursive info is included too */ copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop), - re->nhe->nhg->nexthop, NULL); + re->nhe->nhg.nexthop, NULL); - /* Ensure that the dplane's nexthops flags are clear. */ + /* Ensure that the dplane nexthops' flags are clear. */ for (ALL_NEXTHOPS(ctx->u.rinfo.zd_ng, nexthop)) UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); @@ -1596,9 +1596,9 @@ static int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx, ctx->u.rinfo.nhe.vrf_id = nhe->vrf_id; ctx->u.rinfo.nhe.type = nhe->type; - nexthop_group_copy(&(ctx->u.rinfo.nhe.ng), nhe->nhg); + nexthop_group_copy(&(ctx->u.rinfo.nhe.ng), &(nhe->nhg)); - /* If its a group, convert it to a grp array of ids */ + /* If this is a group, convert it to a grp array of ids */ if (!zebra_nhg_depends_is_empty(nhe) && !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_RECURSIVE)) ctx->u.rinfo.nhe.nh_grp_count = zebra_nhg_nhe2grp( @@ -1753,7 +1753,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx, if (re) copy_nexthops(&(ctx->u.pw.nhg.nexthop), - re->nhe->nhg->nexthop, NULL); + re->nhe->nhg.nexthop, NULL); route_unlock_node(rn); } @@ -1849,7 +1849,7 @@ dplane_route_update_internal(struct route_node *rn, * We'll need these to do per-nexthop deletes. */ copy_nexthops(&(ctx->u.rinfo.zd_old_ng.nexthop), - old_re->nhe->nhg->nexthop, NULL); + old_re->nhe->nhg.nexthop, NULL); #endif /* !HAVE_NETLINK */ } |