From fbce9231d1f70f922ee854205f8c696c4658f56f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 8 Feb 2024 12:05:05 -0500 Subject: [PATCH] zebra: Remove function abstraction in interface.c zebra_if_nhg_dependents_XXX were just simple wrapper functions that inited/deleted data structures. These were already function calls themselves. Let's remove the abstraction and make the code simpler. Signed-off-by: Donald Sharp --- zebra/interface.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/zebra/interface.c b/zebra/interface.c index efa7283e31..d3ea185338 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -108,17 +108,6 @@ static void zebra_if_node_destroy(route_table_delegate_t *delegate, route_node_destroy(delegate, table, node); } -static void zebra_if_nhg_dependents_free(struct zebra_if *zebra_if) -{ - nhg_connected_tree_free(&zebra_if->nhg_dependents); -} - -static void zebra_if_nhg_dependents_init(struct zebra_if *zebra_if) -{ - nhg_connected_tree_init(&zebra_if->nhg_dependents); -} - - route_table_delegate_t zebra_if_table_delegate = { .create_node = route_node_create, .destroy_node = zebra_if_node_destroy}; @@ -137,7 +126,7 @@ static int if_zebra_new_hook(struct interface *ifp) zebra_if->link_nsid = NS_UNKNOWN; - zebra_if_nhg_dependents_init(zebra_if); + nhg_connected_tree_init(&zebra_if->nhg_dependents); zebra_ptm_if_init(zebra_if); @@ -221,7 +210,7 @@ static int if_zebra_delete_hook(struct interface *ifp) zebra_evpn_mac_ifp_del(ifp); if_nhg_dependents_release(ifp); - zebra_if_nhg_dependents_free(zebra_if); + nhg_connected_tree_free(&zebra_if->nhg_dependents); XFREE(MTYPE_ZIF_DESC, zebra_if->desc);