From d3adb8a8f6d8671ec2e6b493cb9509c45fb0af32 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 15 Nov 2023 13:47:22 -0500 Subject: [PATCH] zebra: On shutdown cleanup zns memory. Signed-off-by: Donald Sharp --- zebra/zebra_ns.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c index ffdb9df531..f74b30a6ce 100644 --- a/zebra/zebra_ns.c +++ b/zebra/zebra_ns.c @@ -42,11 +42,6 @@ struct zebra_ns *zebra_ns_lookup(ns_id_t ns_id) return (info == NULL) ? dzns : info; } -static struct zebra_ns *zebra_ns_alloc(void) -{ - return XCALLOC(MTYPE_ZEBRA_NS, sizeof(struct zebra_ns)); -} - static int zebra_ns_new(struct ns *ns) { struct zebra_ns *zns; @@ -57,7 +52,7 @@ static int zebra_ns_new(struct ns *ns) if (IS_ZEBRA_DEBUG_EVENT) zlog_info("ZNS %s with id %u (created)", ns->name, ns->ns_id); - zns = zebra_ns_alloc(); + zns = XCALLOC(MTYPE_ZEBRA_NS, sizeof(struct zebra_ns)); ns->info = zns; zns->ns = ns; zns->ns_id = ns->ns_id; @@ -194,6 +189,8 @@ int zebra_ns_final_shutdown(struct ns *ns, kernel_terminate(zns, true); + zebra_ns_delete(ns); + return NS_WALK_CONTINUE; } -- 2.39.5