diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-02-22 10:56:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 10:56:31 +0200 |
| commit | 2bea6210453f08329d70442b93a45953313f43b0 (patch) | |
| tree | 1328b2e680972e9d4aba66a6790d1471d9bedc9e /zebra/zebra_rib.c | |
| parent | 410d78b7a4f2c8b4d4c3736c6d6cdb710287ca80 (diff) | |
| parent | 42a89db1aa6eed18e339efdc38826eb673fc00ed (diff) | |
Merge pull request #12858 from FRRouting/mergify/bp/stable/8.4/pr-12818
zebra: Fix other table inactive when ip import-table is on (backport #12818)
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index fceaaaa9f0..adc6a904f1 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -3800,7 +3800,9 @@ static void rib_link(struct route_node *rn, struct route_entry *re, int process) rmap_name = zebra_get_import_table_route_map(afi, re->table); zebra_add_import_table_entry(zvrf, rn, re, rmap_name); - } else if (process) + } + + if (process) rib_queue_add(rn); } @@ -3875,11 +3877,9 @@ void rib_delnode(struct route_node *rn, struct route_entry *re) zlog_debug("%s(%u):%pRN: Freeing route rn %p, re %p (%s)", vrf_id_to_name(re->vrf_id), re->vrf_id, rn, rn, re, zebra_route_string(re->type)); - - rib_unlink(rn, re); - } else { - rib_queue_add(rn); } + + rib_queue_add(rn); } /* |