From patchwork Tue Sep 11 15:29:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 1438661 X-Patchwork-Delegate: alexne@voltaire.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B5F6F4025E for ; Tue, 11 Sep 2012 15:29:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756624Ab2IKP3M (ORCPT ); Tue, 11 Sep 2012 11:29:12 -0400 Received: from eu1sys200aog101.obsmtp.com ([207.126.144.111]:46908 "HELO eu1sys200aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756550Ab2IKP3L (ORCPT ); Tue, 11 Sep 2012 11:29:11 -0400 Received: from MTLCAS01.mtl.com ([193.47.165.155]) (using TLSv1) by eu1sys200aob101.postini.com ([207.126.147.11]) with SMTP ID DSNKUE9Yxcsvr01HKWbIo4yBK2BrYs1TnZsV@postini.com; Tue, 11 Sep 2012 15:29:10 UTC Received: from [10.7.17.62] (10.0.13.1) by MTLCAS01.mtl.com (10.0.8.71) with Microsoft SMTP Server id 14.2.247.3; Tue, 11 Sep 2012 18:29:07 +0300 Message-ID: <504F58C3.1060801@mellanox.co.il> Date: Tue, 11 Sep 2012 18:29:07 +0300 From: Yevgeny Kliteynik Reply-To: User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: , Linux RDMA , Yevgeny Kliteynik Subject: [PATCH 5/8 v2] opensm/libvendor/osm_vendor_ibumad.c:rename "mad" to "p_mad" to indicate pointer X-Originating-IP: [10.0.13.1] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Yevgeny Kliteynik --- libvendor/osm_vendor_ibumad.c | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/libvendor/osm_vendor_ibumad.c b/libvendor/osm_vendor_ibumad.c index b068443..e0c9f90 100644 --- a/libvendor/osm_vendor_ibumad.c +++ b/libvendor/osm_vendor_ibumad.c @@ -288,7 +288,7 @@ static void *umad_receiver(void *p_ptr) osm_umad_bind_info_t *p_bind; osm_mad_addr_t osm_addr; osm_madw_t *p_madw, *p_req_madw; - ib_mad_t *mad; + ib_mad_t *p_mad; void *umad = 0; int mad_agent, length; @@ -340,11 +340,11 @@ static void *umad_receiver(void *p_ptr) continue; } - mad = (ib_mad_t *) umad_get_mad(umad); + p_mad = (ib_mad_t *) umad_get_mad(umad); ib_mad_addr_conv(umad, &osm_addr, - mad->mgmt_class == IB_MCLASS_SUBN_LID || - mad->mgmt_class == IB_MCLASS_SUBN_DIR); + p_mad->mgmt_class == IB_MCLASS_SUBN_LID || + p_mad->mgmt_class == IB_MCLASS_SUBN_DIR); if (!(p_madw = osm_mad_pool_get(p_bind->p_mad_pool, (osm_bind_handle_t) p_bind, @@ -367,15 +367,15 @@ static void *umad_receiver(void *p_ptr) /* if status != 0 then we are handling recv timeout on send */ if (umad_status(p_madw->vend_wrap.umad)) { - if (!(p_req_madw = get_madw(p_vend, &mad->trans_id, - mad->mgmt_class))) { + if (!(p_req_madw = get_madw(p_vend, &p_mad->trans_id, + p_mad->mgmt_class))) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5412: " "Failed to obtain request madw for timed out MAD" " (class=0x%X method=0x%X attr=0x%X tid=0x%"PRIx64") -- dropping\n", - mad->mgmt_class, mad->method, - cl_ntoh16(mad->attr_id), - cl_ntoh64(mad->trans_id)); + p_mad->mgmt_class, p_mad->method, + cl_ntoh16(p_mad->attr_id), + cl_ntoh64(p_mad->trans_id)); } else { p_req_madw->status = IB_TIMEOUT; log_send_error(p_vend, p_req_madw); @@ -394,30 +394,30 @@ static void *umad_receiver(void *p_ptr) } p_req_madw = 0; - if (ib_mad_is_response(mad) && - !(p_req_madw = get_madw(p_vend, &mad->trans_id, - mad->mgmt_class))) { + if (ib_mad_is_response(p_mad) && + !(p_req_madw = get_madw(p_vend, &p_mad->trans_id, + p_mad->mgmt_class))) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5413: " "Failed to obtain request madw for received MAD" " (class=0x%X method=0x%X attr=0x%X tid=0x%"PRIx64") -- dropping\n", - mad->mgmt_class, mad->method, - cl_ntoh16((mad)->attr_id), - cl_ntoh64(mad->trans_id)); + p_mad->mgmt_class, p_mad->method, + cl_ntoh16(p_mad->attr_id), + cl_ntoh64(p_mad->trans_id)); osm_mad_pool_put(p_bind->p_mad_pool, p_madw); continue; } #ifndef VENDOR_RMPP_SUPPORT - if ((mad->mgmt_class != IB_MCLASS_SUBN_DIR) && - (mad->mgmt_class != IB_MCLASS_SUBN_LID) && - (ib_rmpp_is_flag_set((ib_rmpp_mad_t *) mad, + if ((p_mad->mgmt_class != IB_MCLASS_SUBN_DIR) && + (p_mad->mgmt_class != IB_MCLASS_SUBN_LID) && + (ib_rmpp_is_flag_set((ib_rmpp_mad_t *) p_mad, IB_RMPP_FLAG_ACTIVE))) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5414: " "class 0x%x method 0x%x RMPP version %d type " "%d flags 0x%x received -- dropping\n", - mad->mgmt_class, mad->method, - ((ib_rmpp_mad_t *) mad)->rmpp_version, - ((ib_rmpp_mad_t *) mad)->rmpp_type, - ((ib_rmpp_mad_t *) mad)->rmpp_flags); + p_mad->mgmt_class, p_mad->method, + ((ib_rmpp_mad_t *) p_mad)->rmpp_version, + ((ib_rmpp_mad_t *) p_mad)->rmpp_type, + ((ib_rmpp_mad_t *) p_mad)->rmpp_flags); osm_mad_pool_put(p_bind->p_mad_pool, p_madw); continue; }