From patchwork Tue Jun 15 19:53:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 106318 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5FJrgMl028443 for ; Tue, 15 Jun 2010 19:53:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752808Ab0FOTxq (ORCPT ); Tue, 15 Jun 2010 15:53:46 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:52780 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754420Ab0FOTxo (ORCPT ); Tue, 15 Jun 2010 15:53:44 -0400 X-WSS-ID: 0L42N9C-0C-6Y4-02 X-M-MSG: Received: from sentry.sandia.gov (mm03snlnto.sandia.gov [132.175.109.20]) by sentry-three.sandia.gov (Postfix) with ESMTP id 1A2714D8878; Tue, 15 Jun 2010 13:53:35 -0600 (MDT) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 15 Jun 2010 13:53:31 -0600 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id o5FJrIBK028244; Tue, 15 Jun 2010 13:53:24 -0600 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, "Jim Schutt" Subject: [PATCH v3 06/17] opensm: Make mcast_mgr_purge_tree() available outside osm_mcast_mgr.c. Date: Tue, 15 Jun 2010 13:53:13 -0600 Message-ID: <1276631604-29230-7-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> References: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.9.395186, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.6.15.194814 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, TO_NO_NAME 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20100615195335; ID=1; SEV=2.3.1; DFV=B2010061519; IFV=NA; AIF=B2010061519; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230352E34433137444133462E303137343A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010061519_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 600905B12GW1265968-01-01 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 15 Jun 2010 19:53:47 +0000 (UTC) diff --git a/opensm/include/opensm/osm_multicast.h b/opensm/include/opensm/osm_multicast.h index 1da575d..df6ac6c 100644 --- a/opensm/include/opensm/osm_multicast.h +++ b/opensm/include/opensm/osm_multicast.h @@ -53,6 +53,7 @@ #include #include #include +#include #ifdef __cplusplus # define BEGIN_C_DECLS extern "C" { @@ -193,6 +194,38 @@ osm_mgrp_t *osm_mgrp_new(IN osm_subn_t * subn, IN ib_net16_t mlid, * Multicast Group, osm_mgrp_delete *********/ +/* + * Need a forward declaration to work around include loop: + * osm_sm.h <- osm_multicast.h + */ +struct osm_sm; + +/****f* OpenSM: Multicast Tree/osm_purge_mtree +* NAME +* osm_purge_mtree +* +* DESCRIPTION +* Frees all the nodes in a multicast spanning tree +* +* SYNOPSIS +*/ +void osm_purge_mtree(IN struct osm_sm * sm, IN osm_mgrp_box_t * mgb); +/* +* PARAMETERS +* sm +* [in] Pointer to osm_sm_t object. +* mgb +* [in] Pointer to an osm_mgrp_box_t object. +* +* RETURN VALUES +* None. +* +* +* NOTES +* +* SEE ALSO +*********/ + /****f* OpenSM: Multicast Group/osm_mgrp_is_guid * NAME * osm_mgrp_is_guid diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c index bd67d4e..e6db6db 100644 --- a/opensm/opensm/osm_mcast_mgr.c +++ b/opensm/opensm/osm_mcast_mgr.c @@ -146,7 +146,7 @@ static void mcast_mgr_purge_tree_node(IN osm_mtree_node_t * p_mtn) free(p_mtn); } -static void mcast_mgr_purge_tree(osm_sm_t * sm, IN osm_mgrp_box_t * mbox) +void osm_purge_mtree(osm_sm_t * sm, IN osm_mgrp_box_t * mbox) { OSM_LOG_ENTER(sm->p_log); @@ -735,7 +735,7 @@ static ib_api_status_t mcast_mgr_build_spanning_tree(osm_sm_t * sm, on multicast forwarding table information if the user wants to preserve existing multicast routes. */ - mcast_mgr_purge_tree(sm, mbox); + osm_purge_mtree(sm, mbox); /* build the first "subset" containing all member ports */ if (make_port_list(&port_list, mbox)) {