From patchwork Tue Apr 23 14:09:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 2477681 X-Patchwork-Delegate: hal@mellanox.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 3F197DF2E5 for ; Tue, 23 Apr 2013 14:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754939Ab3DWOJ0 (ORCPT ); Tue, 23 Apr 2013 10:09:26 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:60466 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754662Ab3DWOJZ (ORCPT ); Tue, 23 Apr 2013 10:09:25 -0400 Received: by mail-ee0-f43.google.com with SMTP id e50so290899eek.16 for ; Tue, 23 Apr 2013 07:09:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=J8bSNu7zw6ZCoT1hbQjauMXM7l8e9HQeAx2IGq0OQJo=; b=ejW2ha/bPNIW1Jlt4y2X4nNp7PxCJPRxV40cb6dsWTgXN08O5YxNsNDsRqHr1t+uwe 8tOpKyO4Fpyiwl0Ex2SSgzxy122r66mjKAJ2aM1fPZc4I/6ygIw99Va4/+KEjiQbXhQ8 X4nquMo17fJ3r/IvP5SKGfQLrcoTFgTTesHGL2tzwyWYa/oCejtssiz6M14f6dNepI4L n+U3KMY17jqwH8snYXWKR5cjTc1eGfY44GIzrpukq1XCrMa9VHrpDLbnoYyRlHwfrwGm Rmh9XyngGiL1tSZB4W6ibYyuoG9r06HqvfquRgVoFesJQcIh3yVj+LdH6+paRKzOQECs OIPA== X-Received: by 10.15.76.132 with SMTP id n4mr20296742eey.16.1366726163861; Tue, 23 Apr 2013 07:09:23 -0700 (PDT) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPS id j44sm47169846eeu.10.2013.04.23.07.09.22 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 23 Apr 2013 07:09:23 -0700 (PDT) From: Alex Netes To: hal@mellanox.com, linux-rdma@vger.kernel.org Cc: Alex Netes Subject: [PATCH] opensm: Fix Q_Key, TClass and limited keys parsing warnings in partitions.conf Date: Tue, 23 Apr 2013 17:09:19 +0300 Message-Id: <1366726159-19201-1-git-send-email-alexne@mellanox.com> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQnVn/hhAMk3BN8Rvn2KHLW2M/c7ALXZDaC7ptsO6i3bbGMmpJCDs1gaoKbdaFQfF5TAZuAq Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Parsing these paraters caused 'unrecognized mgroup flag' warning. Moreover fixed man page/doc for Q_Key/TClass paramters. Signed-off-by: Alex Netes --- doc/partition-config.txt | 4 ++-- man/opensm.8.in | 4 ++-- opensm/osm_prtn_config.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/partition-config.txt b/doc/partition-config.txt index f49d473..3581ef6 100644 --- a/doc/partition-config.txt +++ b/doc/partition-config.txt @@ -94,11 +94,11 @@ General file format: mgid. Furthermore specifying multiple scope settings will result in multiple MC groups being created. - qkey= - specifies the Q_Key for this MC group + Q_Key= - specifies the Q_Key for this MC group (default: 0x0b1b for IP groups, 0 for other groups) WARNING: changing this for the broadcast group may break IPoIB on client nodes!!! - tclass= - specifies tclass for this MC group + TClass= - specifies tclass for this MC group (default is 0) FlowLabel= - specifies FlowLabel for this MC group (default is 0) diff --git a/man/opensm.8.in b/man/opensm.8.in index 37e2eee..4ab7b30 100644 --- a/man/opensm.8.in +++ b/man/opensm.8.in @@ -619,9 +619,9 @@ General file format: mgid. Furthermore specifying multiple scope settings will result in multiple MC groups being created. - qkey= - specifies the Q_Key for this MC group + Q_Key= - specifies the Q_Key for this MC group (default: 0x0b1b for IP groups, 0 for other groups) - tclass= - specifies tclass for this MC group + TClass= - specifies tclass for this MC group (default is 0) FlowLabel= - specifies FlowLabel for this MC group (default is 0) diff --git a/opensm/osm_prtn_config.c b/opensm/osm_prtn_config.c index a3524b1..8f4a673 100644 --- a/opensm/osm_prtn_config.c +++ b/opensm/osm_prtn_config.c @@ -296,12 +296,14 @@ static int parse_group_flag(unsigned lineno, osm_log_t * p_log, else flags->scope_mask |= (1<Q_Key = strtoul(val, NULL, 0)) == 0) OSM_LOG(p_log, OSM_LOG_VERBOSE, "PARSE WARN: line %d: " "flag \'Q_Key\' requires valid value" " - using '0'\n", lineno); } else if (!strncmp(flag, "TClass", strlen(flag))) { + rc =1; if (!val || (flags->TClass = strtoul(val, NULL, 0)) == 0) OSM_LOG(p_log, OSM_LOG_VERBOSE, "PARSE WARN: line %d: " @@ -406,7 +408,7 @@ static int partition_add_port(unsigned lineno, struct part_conf *conf, membership = FULL; else if (!strncmp(flag, "both", strlen(flag))) membership = BOTH; - else if (!strncmp(flag, "limited", strlen(flag))) { + else if (strncmp(flag, "limited", strlen(flag))) { OSM_LOG(conf->p_log, OSM_LOG_VERBOSE, "PARSE WARN: line %d: " "unrecognized port flag \'%s\'."