Skip to content

Commit

Permalink
Merge pull request #17589 from anlancs/master_up
Browse files Browse the repository at this point in the history
zebra: use macro for one check
  • Loading branch information
ton31337 authored Dec 7, 2024
2 parents 797cf47 + f536ca3 commit 17a0d92
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions zebra/zebra_rib.c
Original file line number Diff line number Diff line change
Expand Up @@ -4406,9 +4406,7 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
if (ng) {
nhe.nhg.nexthop = ng->nexthop;

if (re->type == ZEBRA_ROUTE_CONNECT ||
re->type == ZEBRA_ROUTE_LOCAL ||
re->type == ZEBRA_ROUTE_KERNEL)
if (RIB_SYSTEM_ROUTE(re))
SET_FLAG(nhe.flags, NEXTHOP_GROUP_INITIAL_DELAY_INSTALL);
} else if (re->nhe_id > 0)
nhe.id = re->nhe_id;
Expand Down

0 comments on commit 17a0d92

Please sign in to comment.