Merge pull request #4114 from chiragshah6/evpn_dev2

zebra: avoid removing node twice from rb_tree
This commit is contained in:
Mark Stapp 2019-04-09 16:46:59 -04:00 committed by GitHub
commit a5f42f7dea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -202,10 +202,8 @@ void zebra_router_terminate(void)
{ {
struct zebra_router_table *zrt, *tmp; struct zebra_router_table *zrt, *tmp;
RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp) { RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp)
RB_REMOVE(zebra_router_table_head, &zrouter.tables, zrt);
zebra_router_free_table(zrt); zebra_router_free_table(zrt);
}
work_queue_free_and_null(&zrouter.ribq); work_queue_free_and_null(&zrouter.ribq);
meta_queue_free(zrouter.mq); meta_queue_free(zrouter.mq);