From patchwork Fri Dec 18 20:50:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 68802 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 nBIKpGpb024927 for ; Fri, 18 Dec 2009 20:51:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753257AbZLRUvP (ORCPT ); Fri, 18 Dec 2009 15:51:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753786AbZLRUvP (ORCPT ); Fri, 18 Dec 2009 15:51:15 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:47348 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753257AbZLRUvO (ORCPT ); Fri, 18 Dec 2009 15:51:14 -0500 X-WSS-ID: 0KUV8LG-08-7P4-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.20]) by sentry-three.sandia.gov (Postfix) with ESMTP id 2D9B28E9557; Fri, 18 Dec 2009 13:51:15 -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:05 -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 nBIKp1hv008814; Fri, 18 Dec 2009 13:51:05 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 03/12] opensm: Remove unused port specification from torus-2QoS config file parsing. Date: Fri, 18 Dec 2009 13:50:53 -0700 Message-ID: <1261169461-2516-4-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_1900_1999 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=20091218205105; ID=1; SEV=2.3.1; DFV=B2009121816; IFV=NA; AIF=B2009121816; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230362E34423242454233412E303035423A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2009121816_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 673534B32OC300000-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/opensm/osm_ucast_torus.c b/opensm/opensm/osm_ucast_torus.c index bc87757..42582ce 100644 --- a/opensm/opensm/osm_ucast_torus.c +++ b/opensm/opensm/osm_ucast_torus.c @@ -833,8 +833,7 @@ bool parse_pg_max_ports(struct torus *t, const char *parse_sep) } static -bool parse_guid_port(struct torus *t, guid_t *guid, int *port, - const char *typestr, const char *parse_sep) +bool parse_guid(struct torus *t, guid_t *guid, const char *parse_sep) { char *val; bool success = false; @@ -845,11 +844,6 @@ bool parse_guid_port(struct torus *t, guid_t *guid, int *port, *guid = strtoull(val, NULL, 0); *guid = cl_hton64(*guid); - val = strtok(NULL, parse_sep); - if (!val) - goto out; - *port = strtol(val, NULL, 0); - success = true; out: return success; @@ -858,15 +852,14 @@ out: static bool parse_dir_link(int c_dir, struct torus *t, const char *parse_sep) { - int sw_port0, sw_port1; guid_t sw_guid0, sw_guid1; struct link *l; bool success = false; - if (!parse_guid_port(t, &sw_guid0, &sw_port0, "switch", parse_sep)) + if (!parse_guid(t, &sw_guid0, parse_sep)) goto out; - if (!parse_guid_port(t, &sw_guid1, &sw_port1, "switch", parse_sep)) + if (!parse_guid(t, &sw_guid1, parse_sep)) goto out; if (!t) {