From patchwork Mon Apr 4 19:11:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 685311 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p34JBuQ0014328 for ; Mon, 4 Apr 2011 19:11:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754682Ab1DDTLz (ORCPT ); Mon, 4 Apr 2011 15:11:55 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:56524 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754862Ab1DDTLy (ORCPT ); Mon, 4 Apr 2011 15:11:54 -0400 Received: by fxm17 with SMTP id 17so4135533fxm.19 for ; Mon, 04 Apr 2011 12:11:50 -0700 (PDT) Received: by 10.223.77.71 with SMTP id f7mr3210648fak.141.1301944309647; Mon, 04 Apr 2011 12:11:49 -0700 (PDT) Received: from [192.168.1.103] (c-75-69-247-31.hsd1.ma.comcast.net [75.69.247.31]) by mx.google.com with ESMTPS id l2sm1840060fam.29.2011.04.04.12.11.47 (version=SSLv3 cipher=OTHER); Mon, 04 Apr 2011 12:11:48 -0700 (PDT) Message-ID: <4D9A17F0.8020703@dev.mellanox.co.il> Date: Mon, 04 Apr 2011 15:11:44 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-Version: 1.0 To: Alex Netes CC: "linux-rdma@vger.kernel.org" Subject: [PATCH] opensm/osm_pkey_mgr.c: Change log message to reflect used rather than max blocks 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Apr 2011 19:12:02 +0000 (UTC) Eliminate no longer needed variable Signed-off-by: Hal Rosenstock --- ib_pkey_table_t empty_block; @@ -404,13 +403,12 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm, p_pkey_tbl = osm_physp_get_pkey_tbl(p_physp); p_peer_pkey_tbl = &peer->pkeys; - num_of_blocks = osm_pkey_tbl_get_num_blocks(p_pkey_tbl); peer_max_blocks = pkey_mgr_get_physp_max_blocks(peer); if (peer_max_blocks < p_pkey_tbl->used_blocks) { OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 0508: " - "Not enough pkey entries (%u < %u) on switch 0x%016" + "Not enough pkey blocks (%u < %u used) on switch 0x%016" PRIx64 " port %u (%s). Clearing Enforcement bit\n", - peer_max_blocks, num_of_blocks, + peer_max_blocks, p_pkey_tbl->used_blocks, cl_ntoh64(osm_node_get_node_guid(p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -- 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_pkey_mgr.c b/opensm/osm_pkey_mgr.c index ce50f27..92f8f2b 100644 --- a/opensm/osm_pkey_mgr.c +++ b/opensm/osm_pkey_mgr.c @@ -386,7 +386,6 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm, const osm_pkey_tbl_t *p_pkey_tbl; osm_pkey_tbl_t *p_peer_pkey_tbl; uint16_t block_index; - uint16_t num_of_blocks; uint16_t peer_max_blocks; ib_api_status_t status = IB_SUCCESS;