From patchwork Wed Nov 28 19:03:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 1817941 X-Patchwork-Delegate: alexne@voltaire.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 016ADDF26F for ; Wed, 28 Nov 2012 19:03:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755046Ab2K1TDs (ORCPT ); Wed, 28 Nov 2012 14:03:48 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:61131 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754961Ab2K1TDs (ORCPT ); Wed, 28 Nov 2012 14:03:48 -0500 Received: by mail-bk0-f46.google.com with SMTP id q16so5900875bkw.19 for ; Wed, 28 Nov 2012 11:03:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=hPBaTI6mRnyy2p02GwXLW4uMKoW/hM73fPF1+KBxiKo=; b=iYh7Z76Qk5Etra8AOhqF4nLDWuCd1yK7++XyMRbldepf24CPpnPXBJ3tnJ4y0Sdx6U Z/zxd5h9+zxCnx81VNnqtmqxy2CHQ2QutcBijw9+l4WQdRLd8wpKeAQOySIj6cLYDo/K +jihJApy8EYg0ZAEpdYNtcuji0Q4Jele8Rmu4woYgDbiELjWNmuNPe5gy9HdfzBWfmO4 lWKwdfj6YXXGtAACmHOCv0DYcBGliCImawxrkpw4e0cJdjHL5hWbrrzx6eZzNzrYOgSe lrri0MPmyyQ52cYCwmpVzfKiiB5kMCFvEpD5Dum9s1BD6VZgUMlY/ZIPQvC6IiPvLZS6 LB9Q== Received: by 10.204.147.147 with SMTP id l19mr5908953bkv.91.1354129427166; Wed, 28 Nov 2012 11:03:47 -0800 (PST) Received: from [192.168.1.102] (c-71-192-10-85.hsd1.ma.comcast.net. [71.192.10.85]) by mx.google.com with ESMTPS id 1sm13524005bks.3.2012.11.28.11.03.45 (version=SSLv3 cipher=OTHER); Wed, 28 Nov 2012 11:03:46 -0800 (PST) Message-ID: <50B66010.2000307@dev.mellanox.co.il> Date: Wed, 28 Nov 2012 14:03:44 -0500 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: Alex Netes CC: "linux-rdma (linux-rdma@vger.kernel.org)" , Jim Schutt Subject: [PATCH 8/8] opensm/osm_torus.c: Minor simplification to check_qos_config X-Gm-Message-State: ALoCoQmdJ3w4RJ/vIlNzuBy9rG99AzJ0h+n0eLw0MiUpw9coN8biVIDzcw1CmoaqKdxK/QDSzpew Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Eliminate unneeded argument from check_qos_config and rename to check_qos_swe_config Signed-off-by: Jim Schutt Signed-off-by: Hal Rosenstock --- opensm/osm_torus.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c index b2a8832..43343c7 100644 --- a/opensm/osm_torus.c +++ b/opensm/osm_torus.c @@ -9304,8 +9304,8 @@ void check_vlarb_config(const char *vlarb_str, bool is_default, * Use this to check the qos_config for switch external ports. */ static -void check_qos_config(osm_qos_options_t *opt, osm_qos_options_t *def, - const char *str, osm_log_t *log) +void check_qos_swe_config(osm_qos_options_t *opt, + osm_qos_options_t *def, osm_log_t *log) { const char *vlarb_str, *tstr; bool is_default; @@ -9319,7 +9319,7 @@ void check_qos_config(osm_qos_options_t *opt, osm_qos_options_t *def, OSM_LOG(log, OSM_LOG_INFO, "Warning: full torus-2QoS functionality not available " "for configured %s_max_vls = %d\n", - (opt->max_vls > 0 ? str : "qos"), opt->max_vls); + (opt->max_vls > 0 ? "qos_swe" : "qos"), opt->max_vls); vlarb_str = opt->vlarb_high; is_default = false; @@ -9350,7 +9350,7 @@ void check_qos_config(osm_qos_options_t *opt, osm_qos_options_t *def, if (opt->sl2vl) OSM_LOG(log, OSM_LOG_INFO, "Warning: torus-2QoS must override configured " - "%s_sl2vl to generate deadlock-free routes\n", str); + "qos_swe_sl2vl to generate deadlock-free routes\n"); } static @@ -9518,8 +9518,8 @@ out: teardown_torus(ctx->torus); ctx->torus = torus; - check_qos_config(&opt->qos_swe_options, - &opt->qos_options, "qos_swe", log); + check_qos_swe_config(&opt->qos_swe_options, &opt->qos_options, + log); check_qos_ep_config(&opt->qos_ca_options, &opt->qos_options, "qos_ca", log);