Merge pull request #4327 from sworleys/Move-Multipath-Num

[mirror_frr.git] / zebra / zapi_msg.c

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 974cc9de301e369c9b6cb606e4ac175810486fcc..03b9653ce6eda1a40acc1c872f093dbcd31a3275 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -1339,14 +1339,14 @@ static void zread_interface_delete(ZAPI_HANDLER_ARGS)
 void zserv_nexthop_num_warn(const char *caller, const struct prefix *p,
                            const unsigned int nexthop_num)
 {
-       if (nexthop_num > multipath_num) {
+       if (nexthop_num > zrouter.multipath_num) {
                char buff[PREFIX2STR_BUFFER];
 
                prefix2str(p, buff, sizeof(buff));
                flog_warn(
                        EC_ZEBRA_MORE_NH_THAN_MULTIPATH,
                        "%s: Prefix %s has %d nexthops, but we can only use the first %d",
-                       caller, buff, nexthop_num, multipath_num);
+                       caller, buff, nexthop_num, zrouter.multipath_num);
        }
 }
 
@@ -1651,7 +1651,7 @@ static void zsend_capabilities(struct zserv *client, struct zebra_vrf *zvrf)
        zclient_create_header(s, ZEBRA_CAPABILITIES, zvrf->vrf->vrf_id);
        stream_putl(s, vrf_get_backend());
        stream_putc(s, mpls_enabled);
-       stream_putl(s, multipath_num);
+       stream_putl(s, zrouter.multipath_num);
        stream_putc(s, zebra_mlag_get_role());
 
        stream_putw_at(s, 0, stream_get_endp(s));