Merge pull request #17166 from anlancs/zebra/review-remove-one

zebra: remove useless code
This commit is contained in:
Russ White 2024-10-22 11:06:50 -04:00 committed by GitHub
commit 3152f4933e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -640,20 +640,16 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re,
struct nexthop *nexthop; struct nexthop *nexthop;
struct rib_table_info *info = srcdest_rnode_table_info(rn); struct rib_table_info *info = srcdest_rnode_table_info(rn);
struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(re->vrf_id); struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(re->vrf_id);
const struct prefix *p, *src_p;
enum zebra_dplane_result ret; enum zebra_dplane_result ret;
rib_dest_t *dest = rib_dest_from_rnode(rn); rib_dest_t *dest = rib_dest_from_rnode(rn);
srcdest_rnode_prefixes(rn, &p, &src_p);
if (info->safi != SAFI_UNICAST) { if (info->safi != SAFI_UNICAST) {
for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) for (ALL_NEXTHOPS(re->nhe->nhg, nexthop))
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
return; return;
} }
/* /*
* Install the resolved nexthop object first. * Install the resolved nexthop object first.
*/ */
@ -1339,7 +1335,6 @@ static void rib_process(struct route_node *rn)
if (CHECK_FLAG(re->status, ROUTE_ENTRY_CHANGED)) { if (CHECK_FLAG(re->status, ROUTE_ENTRY_CHANGED)) {
proto_re_changed = re; proto_re_changed = re;
if (!nexthop_active_update(rn, re, old_fib)) { if (!nexthop_active_update(rn, re, old_fib)) {
const struct prefix *p;
struct rib_table_info *info; struct rib_table_info *info;
if (re->type == ZEBRA_ROUTE_TABLE) { if (re->type == ZEBRA_ROUTE_TABLE) {
@ -1373,7 +1368,6 @@ static void rib_process(struct route_node *rn)
} }
info = srcdest_rnode_table_info(rn); info = srcdest_rnode_table_info(rn);
srcdest_rnode_prefixes(rn, &p, NULL);
zsend_route_notify_owner( zsend_route_notify_owner(
rn, re, ZAPI_ROUTE_FAIL_INSTALL, rn, re, ZAPI_ROUTE_FAIL_INSTALL,
info->afi, info->safi); info->afi, info->safi);