From patchwork Mon Jun 14 12:46:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 105954 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 o5ECmBAL025994 for ; Mon, 14 Jun 2010 12:48:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752245Ab0FNMsJ (ORCPT ); Mon, 14 Jun 2010 08:48:09 -0400 Received: from qmta01.westchester.pa.mail.comcast.net ([76.96.62.16]:52979 "EHLO qmta01.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750956Ab0FNMsJ (ORCPT ); Mon, 14 Jun 2010 08:48:09 -0400 Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44]) by qmta01.westchester.pa.mail.comcast.net with comcast id Vo6n1e0040xGWP851oo7Jt; Mon, 14 Jun 2010 12:48:07 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta12.westchester.pa.mail.comcast.net with comcast id Voo61e00G0hNrtn3Yoo7w7; Mon, 14 Jun 2010 12:48:07 +0000 Received: from hal.comcast.net (localhost.localdomain [127.0.0.1]) by hal.comcast.net (8.14.3/8.14.3) with ESMTP id o5ECmKZT007177; Mon, 14 Jun 2010 08:48:25 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o5ECkkYv005933; Mon, 14 Jun 2010 08:46:46 -0400 Date: Mon, 14 Jun 2010 08:46:46 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCH] [RESEND] opensm/osm_mcast_mgr.c: Only route MLIDs with more than 1 member Message-ID: <20100614124646.GA5930@comcast.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) 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]); Mon, 14 Jun 2010 12:48:14 +0000 (UTC) diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c index 322635d..e42070d 100644 --- a/opensm/opensm/osm_mcast_mgr.c +++ b/opensm/opensm/osm_mcast_mgr.c @@ -4,6 +4,7 @@ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2008 Xsigo Systems Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2010 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -746,10 +747,10 @@ static ib_api_status_t mcast_mgr_build_spanning_tree(osm_sm_t * sm, } num_ports = cl_qlist_count(&port_list); - if (num_ports == 0) { + if (num_ports < 2) { OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, - "MLID 0x%X has no members - nothing to do\n", - mbox->mlid); + "MLID 0x%X has %u members - nothing to do\n", + mbox->mlid, num_ports); goto Exit; }