From patchwork Fri Dec 18 20:50:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 68806 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBIKpGpf024927 for ; Fri, 18 Dec 2009 20:51:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754650AbZLRUvU (ORCPT ); Fri, 18 Dec 2009 15:51:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932418AbZLRUvU (ORCPT ); Fri, 18 Dec 2009 15:51:20 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:47432 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932420AbZLRUvS (ORCPT ); Fri, 18 Dec 2009 15:51:18 -0500 X-WSS-ID: 0KUV8LL-08-7PX-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.21]) by sentry-three.sandia.gov (Postfix) with ESMTP id 239CC8E955F; Fri, 18 Dec 2009 13:51:20 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 18 Dec 2009 13:51:08 -0700 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.1/8.14.1) with ESMTP id nBIKp1i2008814; Fri, 18 Dec 2009 13:51:07 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 09/12] opensm: Make mcast_mgr_purge_tree() available outside osm_mcast_mgr.c. Date: Fri, 18 Dec 2009 13:50:58 -0700 Message-ID: <1261169461-2516-9-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.5.6.GIT In-Reply-To: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> References: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.7.378829, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2009.12.18.204217 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' 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_NS ' X-TMWD-Spam-Summary: TS=20091218205109; ID=1; SEV=2.3.1; DFV=B2009121816; IFV=NA; AIF=B2009121816; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230352E34423242454233442E303036373A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2009121816_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 673534B62OC300009-01-01 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 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 e65e459..11a10ce 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); @@ -695,7 +695,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)) {