zebra: fix nexthop_group conversion in fpm code

Recent commit that embedded the nhg_hash_entry's group
missed a couple of fpm modules.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/zebra/zebra_fpm_dt.c b/zebra/zebra_fpm_dt.c
index 389781d4f74ceaa3eced608b3dab5c1f1d6972f0..81437e72f511ebd5d0fbc1d039f3f2e9d9d2054b 100644 (file)
--- 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 d50981debf58685b38dbfa19f484d973532b1dce..ade4b636d62c77f66c15598e8f2d270e7d3467d3 100644 (file)
--- 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;