summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2023-02-21 17:37:31 +0100
committerGitHub <noreply@github.com>2023-02-21 17:37:31 +0100
commit64269ccae1bccf29d4249e721b58a3e359839ca9 (patch)
tree2ee88c75db67402d1d0b651c39c4efd317472fc6
parentMerge pull request #12832 from opensourcerouting/fix/deprecate_bgp_internet_c... (diff)
parentzebra: Fix other table inactive when ip import-table is on (diff)
downloadfrr-64269ccae1bccf29d4249e721b58a3e359839ca9.tar.xz
frr-64269ccae1bccf29d4249e721b58a3e359839ca9.zip
Merge pull request #12818 from imzyxwvu/fix/other-table-inactive
zebra: Fix other table inactive when ip import-table is on
-rw-r--r--zebra/zebra_rib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index fc3f57eeb..c42b8468f 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -3924,7 +3924,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);
}
@@ -3999,11 +4001,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);
}
/*