From patchwork Tue Feb 16 16:16:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 79740 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 o1GGH0i0015342 for ; Tue, 16 Feb 2010 16:17:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757191Ab0BPQQ7 (ORCPT ); Tue, 16 Feb 2010 11:16:59 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:59491 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757187Ab0BPQQ6 (ORCPT ); Tue, 16 Feb 2010 11:16:58 -0500 X-WSS-ID: 0KXXZWA-08-3IE-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 2ED678CB9B2; Tue, 16 Feb 2010 09:16:58 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 16 Feb 2010 09:16:46 -0700 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.1/8.14.1) with ESMTP id o1GGGjkJ001176; Tue, 16 Feb 2010 09:16:46 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, kliteyn@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 1/3] opensm: Use local variables when searching for torus-2QoS master spanning tree root. Date: Tue, 16 Feb 2010 09:16:43 -0700 Message-ID: <1266337005-29874-2-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.5.6.GIT In-Reply-To: <1261169461-2516-1-git-send-email-jaschut@sandia.gov> References: <1261169461-2516-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.7.378829, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.2.16.160618 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 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=20100216161647; ID=1; SEV=2.3.1; DFV=B2010021615; IFV=NA; AIF=B2010021615; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230322E34423741433445462E303042443A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010021615_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 67641B642EK684193-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, 16 Feb 2010 16:17:01 +0000 (UTC) diff --git a/opensm/opensm/osm_ucast_torus.c b/opensm/opensm/osm_ucast_torus.c index e2eb324..728e56c 100644 --- a/opensm/opensm/osm_ucast_torus.c +++ b/opensm/opensm/osm_ucast_torus.c @@ -8751,22 +8751,23 @@ ib_api_status_t torus_mcast_stree(void *context, osm_mgrp_box_t *mgb) } static -bool good_xy_ring(struct torus *t, int x, int y, int z) +bool good_xy_ring(struct torus *t, const int x, const int y, const int z) { struct t_switch ****sw = t->sw; bool good_ring = true; + int x_tst, y_tst; - for (x = 0; x < t->x_sz && good_ring; x++) - good_ring = sw[x][y][z]; + for (x_tst = 0; x_tst < t->x_sz && good_ring; x_tst++) + good_ring = sw[x_tst][y][z]; - for (y = 0; y < t->y_sz && good_ring; y++) - good_ring = sw[x][y][z]; + for (y_tst = 0; y_tst < t->y_sz && good_ring; y_tst++) + good_ring = sw[x][y_tst][z]; return good_ring; } static -struct t_switch *find_plane_mid(struct torus *t, int z) +struct t_switch *find_plane_mid(struct torus *t, const int z) { int x, dx, xm = t->x_sz / 2; int y, dy, ym = t->y_sz / 2;