From 296ed22f63cbc313a5257a5bd16c6773a488299a Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Thu, 24 Oct 2024 14:52:21 -0700 Subject: [PATCH] zebra: remove if_table from the zebra NS Finish removing the if_table from the zebra NS struct. Signed-off-by: Mark Stapp --- zebra/zebra_ns.c | 5 ----- zebra/zebra_ns.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c index 42a9a2fe0452..771e7d671998 100644 --- a/zebra/zebra_ns.c +++ b/zebra/zebra_ns.c @@ -234,7 +234,6 @@ static int zebra_ns_new(struct ns *ns) zns->ns_id = ns->ns_id; /* Do any needed per-NS data structure allocation. */ - zns->if_table = route_table_init(); ifp_tree_init(&zns->ifp_tree); return 0; @@ -334,10 +333,6 @@ int zebra_ns_enable(ns_id_t ns_id, void **info) */ static int zebra_ns_disable_internal(struct zebra_ns *zns, bool complete) { - if (zns->if_table) - route_table_finish(zns->if_table); - zns->if_table = NULL; - zebra_dplane_ns_enable(zns, false /*Disable*/); kernel_terminate(zns, complete); diff --git a/zebra/zebra_ns.h b/zebra/zebra_ns.h index 10e414dac3aa..0e40cebbe0a8 100644 --- a/zebra/zebra_ns.h +++ b/zebra/zebra_ns.h @@ -67,8 +67,6 @@ struct zebra_ns { struct nlsock ge_netlink_cmd; /* command channel for generic netlink */ #endif - struct route_table *if_table; - /* Tree of interfaces in this ns */ struct ifp_tree_head ifp_tree;