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

Merge pull request #16736 from mjstapp/fix_bgp_evpn_if_clause

Browse Source 
bgpd: fix duplicated test clause
This commit is contained in:
Donatas Abraitis 2024-09-04 08:12:26 +03:00 committed by GitHub
commit 40a47a92f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bgpd/bgp_evpn.c
View File

@ -2124,22 +2124,18 @@ static void evpn_zebra_reinstall_best_route(struct bgp *bgp,
} }
} }
if (curr_select && curr_select->type == ZEBRA_ROUTE_BGP if (curr_select && curr_select->type == ZEBRA_ROUTE_BGP &&
&& (curr_select->sub_type == BGP_ROUTE_IMPORTED || (curr_select->sub_type == BGP_ROUTE_IMPORTED ||
bgp_evpn_attr_is_sync(curr_select->attr))) bgp_evpn_attr_is_sync(curr_select->attr))) {
if (curr_select && curr_select->type == ZEBRA_ROUTE_BGP && if (CHECK_FLAG(bgp->flags, BGP_FLAG_DELETE_IN_PROGRESS))
(curr_select->sub_type == BGP_ROUTE_IMPORTED || evpn_zebra_install(bgp, vpn,
bgp_evpn_attr_is_sync(curr_select->attr))) { (const struct prefix_evpn *)
if (CHECK_FLAG(bgp->flags, BGP_FLAG_DELETE_IN_PROGRESS)) bgp_dest_get_prefix(dest),
evpn_zebra_install(bgp, vpn, curr_select);
(const struct prefix_evpn *) else
bgp_dest_get_prefix( bgp_zebra_route_install(dest, curr_select, bgp, true,
dest), vpn, false);
curr_select); }
else
bgp_zebra_route_install(dest, curr_select, bgp,
true, vpn, false);
}
} }
/* /*