From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 16 May 2019 15:49:19 +0000 (-0400)
Subject: zebra: fix missed multipath_num change
X-Git-Tag: base_7.2~333^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b03e089d4506e423df48efac52a1000689953e92;p=matthieu%2Ffrr.git

zebra: fix missed multipath_num change

The multipath_num global variable was moved into
zrouter.multipath_num but this particular usage
of it was not updated.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c
index 0f95c9ba8b..3054b8a34d 100644
--- a/zebra/zebra_fpm_protobuf.c
+++ b/zebra/zebra_fpm_protobuf.c
@@ -34,6 +34,7 @@
 #include "qpb/linear_allocator.h"
 #include "fpm/fpm_pb.h"
 
+#include "zebra_router.h"
 #include "zebra_fpm_private.h"
 
 /*
@@ -173,7 +174,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
 	 */
 	num_nhs = 0;
 	for (ALL_NEXTHOPS(re->ng, nexthop)) {
-		if (num_nhs >= multipath_num)
+		if (num_nhs >= zrouter.multipath_num)
 			break;
 
 		if (num_nhs >= array_size(nexthops))