From patchwork Wed Dec 16 11:57:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 68347 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 nBI4ixnX005715 for ; Fri, 18 Dec 2009 04:45:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754938AbZLPL7W (ORCPT ); Wed, 16 Dec 2009 06:59:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755162AbZLPL7W (ORCPT ); Wed, 16 Dec 2009 06:59:22 -0500 Received: from qmta08.westchester.pa.mail.comcast.net ([76.96.62.80]:46340 "EHLO QMTA08.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754938AbZLPL7V (ORCPT ); Wed, 16 Dec 2009 06:59:21 -0500 Received: from OMTA23.westchester.pa.mail.comcast.net ([76.96.62.74]) by QMTA08.westchester.pa.mail.comcast.net with comcast id Hnpt1d0041c6gX858nzMfh; Wed, 16 Dec 2009 11:59:21 +0000 Received: from hal.comcast.net ([75.69.247.31]) by OMTA23.westchester.pa.mail.comcast.net with comcast id Ho8U1d00Q0hNrtn3jo8UbA; Wed, 16 Dec 2009 12:08:29 +0000 Received: from hal.comcast.net (localhost.localdomain [127.0.0.1]) by hal.comcast.net (8.14.3/8.14.3) with ESMTP id nBGBvvcD021758; Wed, 16 Dec 2009 06:58:03 -0500 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id nBGBvXEo021727; Wed, 16 Dec 2009 06:57:33 -0500 Date: Wed, 16 Dec 2009 06:57:32 -0500 From: Hal Rosenstock To: sashak@voltaire.com Cc: kliteyn@dev.mellanox.co.il, Line.Holen@sun.com, linux-rdma@vger.kernel.org Subject: [PATCH] opensm/osm_vl15intf.c: Fix transaction ID printing in vl15_send_mad Message-ID: <20091216115732.GA21723@comcast.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) 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_vl15intf.c b/opensm/opensm/osm_vl15intf.c index cc3ff33..ec7dadf 100644 --- a/opensm/opensm/osm_vl15intf.c +++ b/opensm/opensm/osm_vl15intf.c @@ -3,6 +3,7 @@ * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. * Copyright (c) 2002-2006 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. + * Copyright (c) 2009 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -57,6 +58,7 @@ static void vl15_send_mad(osm_vl15_t * p_vl, osm_madw_t * p_madw) { ib_api_status_t status; + ib_net64_t trans_id; /* Non-response-expected mads are not throttled on the wire @@ -76,6 +78,7 @@ static void vl15_send_mad(osm_vl15_t * p_vl, osm_madw_t * p_madw) cl_atomic_inc(&p_vl->p_stats->qp0_unicasts_sent); cl_atomic_inc(&p_vl->p_stats->qp0_mads_sent); + trans_id = p_madw->p_mad->trans_id; status = osm_vendor_send(osm_madw_get_bind_handle(p_madw), p_madw, p_madw->resp_expected); @@ -93,7 +96,7 @@ static void vl15_send_mad(osm_vl15_t * p_vl, osm_madw_t * p_madw) OSM_LOG(p_vl->p_log, OSM_LOG_ERROR, "ERR 3E03: " "MAD send failed (%s), TID 0x%" PRIx64 "\n", - ib_get_err_str(status), cl_ntoh64(p_madw->p_mad->trans_id)); + ib_get_err_str(status), cl_ntoh64(trans_id)); /* The MAD was never successfully sent, so