diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-12-04 14:11:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-04 14:11:04 -0500 |
| commit | e302caaa818a2e582a98f16eaa807bc3928bf617 (patch) | |
| tree | cb6561db9a055c41f910e764f8178cf31637d3ad /zebra/zebra_dplane.c | |
| parent | 86637de7f9e93ae64e7be226a5e69e80fb0e2ae4 (diff) | |
| parent | 0eb97b860dc94329cf9add9f8f3d3a2c7f539568 (diff) | |
Merge pull request #5416 from mjstapp/re_nhe_pointer
lib,zebra: use shared nexthop-group in route_entry
Diffstat (limited to 'zebra/zebra_dplane.c')
| -rw-r--r-- | zebra/zebra_dplane.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index aecadfadf8..bc4f51f70f 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -1508,7 +1508,8 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx, ctx->u.rinfo.zd_safi = info->safi; /* Copy nexthops; recursive info is included too */ - copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop), re->ng->nexthop, NULL); + copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop), + re->nhe->nhg->nexthop, NULL); /* Ensure that the dplane's nexthops flags are clear. */ for (ALL_NEXTHOPS(ctx->u.rinfo.zd_ng, nexthop)) @@ -1748,7 +1749,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx, if (re) copy_nexthops(&(ctx->u.pw.nhg.nexthop), - re->ng->nexthop, NULL); + re->nhe->nhg->nexthop, NULL); route_unlock_node(rn); } @@ -1844,7 +1845,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->ng->nexthop, NULL); + old_re->nhe->nhg->nexthop, NULL); #endif /* !HAVE_NETLINK */ } |