proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 21:57:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17589 from anlancs/master_up

Browse Source 
zebra: use macro for one check
This commit is contained in:
Donatas Abraitis 2024-12-07 22:35:12 +02:00 committed by GitHub
commit 17a0d92ffd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/zebra_rib.c
View File

@ -4406,9 +4406,7 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
if (ng) { if (ng) {
nhe.nhg.nexthop = ng->nexthop; nhe.nhg.nexthop = ng->nexthop;
if (re->type == ZEBRA_ROUTE_CONNECT || if (RIB_SYSTEM_ROUTE(re))
re->type == ZEBRA_ROUTE_LOCAL ||
re->type == ZEBRA_ROUTE_KERNEL)
SET_FLAG(nhe.flags, NEXTHOP_GROUP_INITIAL_DELAY_INSTALL); SET_FLAG(nhe.flags, NEXTHOP_GROUP_INITIAL_DELAY_INSTALL);
} else if (re->nhe_id > 0) } else if (re->nhe_id > 0)
nhe.id = re->nhe_id; nhe.id = re->nhe_id;