From patchwork Mon Feb 3 11:05:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 3569281 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA3BD9F382 for ; Mon, 3 Feb 2014 13:06:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FD67201B6 for ; Mon, 3 Feb 2014 13:06:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4652520176 for ; Mon, 3 Feb 2014 13:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751025AbaBCNGp (ORCPT ); Mon, 3 Feb 2014 08:06:45 -0500 Received: from mail-wg0-f49.google.com ([74.125.82.49]:54942 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbaBCNGo (ORCPT ); Mon, 3 Feb 2014 08:06:44 -0500 Received: by mail-wg0-f49.google.com with SMTP id a1so11587404wgh.4 for ; Mon, 03 Feb 2014 05:06:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=MHsYMijoYBS/7b17cYFn9qm7PMQZ03nR5slesRMTkJg=; b=SO16sBZHwJeZyaS/IbeLJ3W+D1g1Cz2p7k+FMkiT4/0DXIG4uys0C18ca3+BsqYENb KDrdRo7N4pveyH9UzYYlSaKr9K0OjJlm3XCRB1RSdMRMyRtjdbuLeyoJbj9a0BQ4jyHI +yzanPox6fI0zMo9tUR7n43N0VZbLnWOeF4390krtgYy5b2+rxUOH5RrgxPxX0/R83No hGBzlTL/0/kcSj4dXpuy6oPPI/B3LeKA1mllcEAKjufHMo5k7uLDbKN818JJq+RxKBNx whKahjglHzw4fNYlAE0CAk4fe7+mffS7ajg2psPjCmCLo+iFGokdPr6l50Jtgnz9jrQX FaJQ== X-Gm-Message-State: ALoCoQmokNwM6H+A0FRp2lZKvU4D5b7HgiKTtcWQagm9XFnryu3MFnCbRxKciYFO+I5fM869XUm5 X-Received: by 10.180.99.39 with SMTP id en7mr8742930wib.10.1391432803348; Mon, 03 Feb 2014 05:06:43 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id q5sm25698919wia.2.2014.02.03.05.06.42 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 03 Feb 2014 05:06:42 -0800 (PST) From: Alex Netes To: hal@mellanox.com, linux-rdma@vger.kernel.org Cc: Alex Netes Subject: [PATCH 1/5] opensm/include/iba/ib_types.h: Fix shadow declaration warnings Date: Mon, 3 Feb 2014 13:05:12 +0200 Message-Id: <1391425516-14462-1-git-send-email-alexne@mellanox.com> X-Mailer: git-send-email 1.7.1 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.4 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 Calling cl_ntoh32(cl_ntoh32()) causes shadow parameters redefinition. The fix is to split the cl_ntoh32() calls. Signed-off-by: Alex Netes --- include/iba/ib_types.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/iba/ib_types.h b/include/iba/ib_types.h index 86fa07b..a5136d4 100644 --- a/include/iba/ib_types.h +++ b/include/iba/ib_types.h @@ -8164,9 +8164,10 @@ static inline void OSM_API ib_inform_info_set_qpn(IN ib_inform_info_t * p_ii, IN ib_net32_t const qpn) { uint32_t tmp = cl_ntoh32(p_ii->g_or_v.generic.qpn_resp_time_val); + uint32_t qpn_h = cl_ntoh32(qpn); p_ii->g_or_v.generic.qpn_resp_time_val = - cl_hton32((tmp & 0x000000ff) | ((cl_ntoh32(qpn) << 8) & 0xffffff00) + cl_hton32((tmp & 0x000000ff) | ((qpn_h << 8) & 0xffffff00) ); }