Skip to contentSkip to conversation

osm_mcast_mgr.c: removed mcast_mgr_purge_tree_node due to code duplication

PATCH New Hal Rosenstock 1 participant 1 message Dec 11, 2013 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 osm_mcast_mgr.c: removed mcast_mgr_purge_tree_node due to code duplication

From: Daniel Klein <danielk-VPRAkNaXOzVWk0Htik3J/[email protected]>

Removed mcast_mgr_purge_tree_node from osm_mcast_mgr.c and replaced the calls to it, with calls to osm_mtree_destroy.

---
 opensm/osm_mcast_mgr.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
opensm/osm_mcast_mgr.c +1 -18
index ed14330..ea2a32a 100644
@@ -133,29 +133,12 @@ void osm_mcast_drop_port_list(cl_qlist_t * list)
 				      cl_qlist_remove_head(list));
 }
 
-/**********************************************************************
- Recursively remove nodes from the tree
- *********************************************************************/
-static void mcast_mgr_purge_tree_node(IN osm_mtree_node_t * p_mtn)
-{
-	uint8_t i;
-
-	for (i = 0; i < p_mtn->max_children; i++) {
-		if (p_mtn->child_array[i] &&
-		    (p_mtn->child_array[i] != OSM_MTREE_LEAF))
-			mcast_mgr_purge_tree_node(p_mtn->child_array[i]);
-		p_mtn->child_array[i] = NULL;
-	}
-
-	free(p_mtn);
-}
-
 void osm_purge_mtree(osm_sm_t * sm, IN osm_mgrp_box_t * mbox)
 {
 	OSM_LOG_ENTER(sm->p_log);
 
 	if (mbox->root)
-		mcast_mgr_purge_tree_node(mbox->root);
+		osm_mtree_destroy(mbox->root);
 	mbox->root = NULL;
 
 	OSM_LOG_EXIT(sm->p_log);
Signature · 6 lines
1.7.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html