diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2020-02-28 15:25:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 15:25:40 -0500 |
| commit | 99299b445ad531aff234a0699244d1c6fe7359cb (patch) | |
| tree | 94a2440459554e750ad4ee05b33949d72b3c15da | |
| parent | baaaf4f5b6b5904499a6a95976d73be5a9b454ca (diff) | |
| parent | 97cd9bfc0745e96169b46ba93b7c88f6cdba1269 (diff) | |
Merge pull request #5878 from mjstapp/fix_nhg_for_fpm
zebra: fix nexthop_group conversion in fpm code
| -rw-r--r-- | zebra/zebra_fpm_dt.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_fpm_protobuf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_fpm_dt.c b/zebra/zebra_fpm_dt.c index 389781d4f7..81437e72f5 100644 --- a/zebra/zebra_fpm_dt.c +++ b/zebra/zebra_fpm_dt.c @@ -90,7 +90,7 @@ static int zfpm_dt_find_route(rib_dest_t **dest_p, struct route_entry **re_p) if (!re) continue; - if (nexthop_group_active_nexthop_num(re->nhe->nhg) == 0) + if (nexthop_group_active_nexthop_num(&(re->nhe->nhg)) == 0) continue; *dest_p = dest; diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c index d50981debf..ade4b636d6 100644 --- a/zebra/zebra_fpm_protobuf.c +++ b/zebra/zebra_fpm_protobuf.c @@ -173,7 +173,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator, * Figure out the set of nexthops to be added to the message. */ num_nhs = 0; - for (ALL_NEXTHOPS_PTR(re->nhe->nhg, nexthop)) { + for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) { if (num_nhs >= zrouter.multipath_num) break; |