From patchwork Mon Apr 14 00:33:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 3975531 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 182ACBFF02 for ; Mon, 14 Apr 2014 00:33:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47BBB2017B for ; Mon, 14 Apr 2014 00:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F4EC2017A for ; Mon, 14 Apr 2014 00:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbaDNAdN (ORCPT ); Sun, 13 Apr 2014 20:33:13 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:51878 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750889AbaDNAdM (ORCPT ); Sun, 13 Apr 2014 20:33:12 -0400 Received: by mail-we0-f181.google.com with SMTP id q58so7270792wes.26 for ; Sun, 13 Apr 2014 17:33:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=C66WPfmpSUWjByyGhJsLmLd9LT7DCrtz2ZDCXwJSUVo=; b=iv+KHvtvQviLUSY6XqNug5OGyRb1e+NMspMOtb/3sJoXZ0NxExhVUMtWwsON/6Rm/D EUb3bkDEFSNnqKNkoiEdZSE+BOy2v8yD3SONOXM0F8lWkHMJhoVtxn2kCjl/LyPRQL1j Rw+qryYrZlXPxVhYOy706tm9yf886cZs2AoefMooKbKcBEYdzNG0dCIax9ogqq1cQjx1 fJvTbZLKjkVibduK8ZoqfJf266DUOtwm1bNoGlVRXHjV2UvbAVSQO8XRd4Hyq3zTPst3 P7O9xkffcujSZ9VapoTS/ZvI66E0SnmXTnBWwurH6/6URkMfbtQBJAmnR0humBdozAfn F1BA== X-Gm-Message-State: ALoCoQnYBu7AJOk+LbSxQAoTwkrp0RnTPsZui8KQlRp4S2NxsGKYvxB79r8HrhxSU+5uEdhLSIfw X-Received: by 10.180.82.7 with SMTP id e7mr7296483wiy.6.1397435591650; Sun, 13 Apr 2014 17:33:11 -0700 (PDT) Received: from [192.168.1.102] (c-98-229-118-119.hsd1.ma.comcast.net. [98.229.118.119]) by mx.google.com with ESMTPSA id bq12sm9344203wib.0.2014.04.13.17.33.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 13 Apr 2014 17:33:10 -0700 (PDT) Message-ID: <534B2CC2.4080008@dev.mellanox.co.il> Date: Sun, 13 Apr 2014 20:33:06 -0400 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: "linux-rdma (linux-rdma@vger.kernel.org)" CC: Shlomi Nimrodi Subject: [PATCH opensm] osm_ucast_mgr.c: Fix duplicated error codes Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shlomi Nimrodi Date: Thu, 10 Apr 2014 11:33:03 +0300 3A05 is used 3 times, changed two of them. Signed-off-by: Shlomi Nimrodi Signed-off-by: Hal Rosenstock --- opensm/osm_ucast_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/opensm/osm_ucast_mgr.c b/opensm/osm_ucast_mgr.c index 2329ea6..bb874de 100644 --- a/opensm/osm_ucast_mgr.c +++ b/opensm/osm_ucast_mgr.c @@ -700,7 +700,7 @@ static int ucast_mgr_setup_all_switches(osm_subn_t * p_subn) p_subn->opt.port_search_ordering_file); if (parse_node_map(p_subn->opt.port_search_ordering_file, set_search_ordering_ports, p_subn)) { - OSM_LOG(&p_subn->p_osm->log, OSM_LOG_ERROR, "ERR 3A05: " + OSM_LOG(&p_subn->p_osm->log, OSM_LOG_ERROR, "ERR 3A0F: " "cannot parse port_search_ordering_file \'%s\'\n", p_subn->opt.port_search_ordering_file); } @@ -1021,7 +1021,7 @@ static int set_lft_block(IN osm_switch_t *p_sw, IN osm_ucast_mgr_t *p_mgr, CL_DISP_MSGID_NONE, &context); if (status != IB_SUCCESS) { - OSM_LOG(p_mgr->p_log, OSM_LOG_ERROR, "ERR 3A05: " + OSM_LOG(p_mgr->p_log, OSM_LOG_ERROR, "ERR 3A10: " "Sending linear fwd. tbl. block failed (%s)\n", ib_get_err_str(status)); return -1;