diff options
| author | Russ White <russ@riw.us> | 2019-05-16 10:04:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 10:04:14 -0400 |
| commit | cc25952f2a34bcae4cbf6a3e5d40cfc57d4fb250 (patch) | |
| tree | 5ffa168c8d91e120fb3e8e07502e471dd2e4cc9c /zebra/zapi_msg.c | |
| parent | 6f33cbff181010025cb2c9f80aad3c12696e19b0 (diff) | |
| parent | b3f2b59020aeb0d04f7867585766732d54026edf (diff) | |
Merge pull request #4327 from sworleys/Move-Multipath-Num
zebra: Move multipath_num into zrouter
Diffstat (limited to 'zebra/zapi_msg.c')
| -rw-r--r-- | zebra/zapi_msg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 974cc9de30..03b9653ce6 100644 --- 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)); |