From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6389AC432C0 for ; Thu, 21 Nov 2019 18:15:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29A1C2068E for ; Thu, 21 Nov 2019 18:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574360147; bh=9u07fJhZugFMZeiz08pe2ceIS6U6CBwfyhWEJ9dGdUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1CM4llMBCuhD6bSoN4M1Y9frIJrcQ3izgiYYljU+INTJML1/oGaLtuK8sA9IOo84J RjA186MaUAZhxL9xpROo1SUA4aU4vEB35OBPL69QgK+5nSIngbipYr7BYllp7Y3Zjb qq646z5nU0I6AxnMcyxIAK4bNY2Q1i/9hv0Ki4W0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727182AbfKUSPq (ORCPT ); Thu, 21 Nov 2019 13:15:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:54230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727165AbfKUSPq (ORCPT ); Thu, 21 Nov 2019 13:15:46 -0500 Received: from localhost (unknown [5.29.147.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 06D47206CC; Thu, 21 Nov 2019 18:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574360145; bh=9u07fJhZugFMZeiz08pe2ceIS6U6CBwfyhWEJ9dGdUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WSKOsSxEfQBn9SEyFg6yLAPbf4TUAciFfXF0fDm5l57tmBRoCNkebvl9BNAq8uBlL Z5Q71L8nZUvIgLUjYfppqwkdlEY5axKUAg0BAdCF2KL06iWalgsU8kuPLuWkloPNN2 CUQIsjowaTKv2IHWbjm0ZBmXtHui7qG4nVm6qT78= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Bart Van Assche , Sean Hefty Subject: [PATCH rdma-next v1 43/48] RDMA/cm: Convert LAP flow label field Date: Thu, 21 Nov 2019 20:13:08 +0200 Message-Id: <20191121181313.129430-44-leon@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191121181313.129430-1-leon@kernel.org> References: <20191121181313.129430-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Convert LAP flow label field. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 3 ++- drivers/infiniband/core/cm_msgs.h | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index ec2206b9dd14..b41ee97cda86 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -3124,7 +3124,8 @@ static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv, { path->dgid = lap_msg->alt_local_gid; path->sgid = lap_msg->alt_remote_gid; - path->flow_label = cm_lap_get_flow_label(lap_msg); + path->flow_label = + cpu_to_be32(IBA_GET(CM_LAP_ALTERNATE_FLOW_LABEL, lap_msg)); path->hop_limit = lap_msg->alt_hop_limit; path->traffic_class = cm_lap_get_traffic_class(lap_msg); path->reversible = 1; diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index 2172a5c53fbd..978eff812ce1 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -192,11 +192,6 @@ struct cm_lap_msg { u8 private_data[CM_LAP_PRIVATE_DATA_SIZE]; } __packed; -static inline __be32 cm_lap_get_flow_label(struct cm_lap_msg *lap_msg) -{ - return cpu_to_be32(be32_to_cpu(lap_msg->offset56) >> 12); -} - static inline u8 cm_lap_get_traffic_class(struct cm_lap_msg *lap_msg) { return (u8) be32_to_cpu(lap_msg->offset56); -- 2.20.1