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

Merge pull request #4093 from mjstapp/fix_vrf_sched_flag

Browse Source 
zebra: remove unused VRF_RIB_SCHEDULED flag
This commit is contained in:
Donald Sharp 2019-04-05 10:56:08 -04:00 committed by GitHub
commit c54eeca10f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zebra/zebra_rib.c
View File

@ -2065,11 +2065,8 @@ static void rib_process_result(struct zebra_dplane_ctx *ctx)
(old_re && RIB_SYSTEM_ROUTE(old_re))) (old_re && RIB_SYSTEM_ROUTE(old_re)))
zebra_rib_fixup_system(rn); zebra_rib_fixup_system(rn);
if (zvrf) { if (zvrf)
zvrf->installs++; zvrf->installs++;
/* Set flag for nexthop tracking processing */
zvrf->flags |= ZEBRA_VRF_RIB_SCHEDULED;
}
/* Redistribute */ /* Redistribute */
/* /*
@ -2269,7 +2266,6 @@ static void rib_meta_queue_add(struct meta_queue *mq, struct route_node *rn)
{ {
struct route_entry *re = NULL, *curr_re = NULL; struct route_entry *re = NULL, *curr_re = NULL;
uint8_t qindex = MQ_SIZE, curr_qindex = MQ_SIZE; uint8_t qindex = MQ_SIZE, curr_qindex = MQ_SIZE;
struct zebra_vrf *zvrf;
RNODE_FOREACH_RE (rn, curr_re) { RNODE_FOREACH_RE (rn, curr_re) {
curr_qindex = route_info[curr_re->type].meta_q_map; curr_qindex = route_info[curr_re->type].meta_q_map;
@ -2301,10 +2297,6 @@ static void rib_meta_queue_add(struct meta_queue *mq, struct route_node *rn)
if (IS_ZEBRA_DEBUG_RIB_DETAILED) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
rnode_debug(rn, re->vrf_id, "queued rn %p into sub-queue %u", rnode_debug(rn, re->vrf_id, "queued rn %p into sub-queue %u",
(void *)rn, qindex); (void *)rn, qindex);
zvrf = zebra_vrf_lookup_by_id(re->vrf_id);
if (zvrf)
zvrf->flags |= ZEBRA_VRF_RIB_SCHEDULED;
} }
/* Add route_node to work queue and schedule processing */ /* Add route_node to work queue and schedule processing */

3
zebra/zebra_vrf.h
View File

@ -56,8 +56,7 @@ struct zebra_vrf {
/* Flags. */ /* Flags. */
uint16_t flags; uint16_t flags;
#define ZEBRA_VRF_RIB_SCHEDULED (1 << 0) #define ZEBRA_VRF_RETAIN (1 << 0)
#define ZEBRA_VRF_RETAIN (2 << 0)
uint32_t table_id; uint32_t table_id;