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/zebra_rib.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/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index eddf6c8158..72c7385d8a 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -955,7 +955,8 @@ static int nexthop_active_update(struct route_node *rn, struct route_entry *re) * decision point. */ new_active = nexthop_active_check(rn, re, nexthop); - if (new_active && re->nexthop_active_num >= multipath_num) { + if (new_active + && re->nexthop_active_num >= zrouter.multipath_num) { UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); new_active = 0; } |