From patchwork Wed Mar 25 11:16:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6090241 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D72ABF90F for ; Wed, 25 Mar 2015 11:16:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60A0D2038E for ; Wed, 25 Mar 2015 11:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B88B2038A for ; Wed, 25 Mar 2015 11:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752634AbbCYLQS (ORCPT ); Wed, 25 Mar 2015 07:16:18 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:38631 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752398AbbCYLQN (ORCPT ); Wed, 25 Mar 2015 07:16:13 -0400 Received: by wibgn9 with SMTP id gn9so33446073wib.1 for ; Wed, 25 Mar 2015 04:16:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=ECOCMHPDdz2qR2tzD6dGBsjoN2McJmhl1eOdU9TzNrw=; b=HPHxVdJ5nZP4g6RniQ6s4dAxeS8ajBvodNIZtQxsrGc3fkc1np8KrnQRNI2W7RuGSC y3l0kWHnYP9A8YeivEk3AVvvXWcGiEg3Ld9rrUkvuS9aMtsJQjAJ2F2HoKA+BHuh0k7+ dtcqFcQBLMLeyH6C7CfZXRjW3D8Kvqptgqb31DwvhcPFKzpbD+cF76iAHaEJcFrUDO1f empT2/HrAOl0FvivxtuwaPg92LmgpKyPyppAZyTKAaMvdxDqyYEOd01AXy7nIKuTReDk avPtpSbEhSaacGnpwfsota4Hk2UfLzKcNcmG1vEzeOQoI7jBLFKzRwfy5thSmDwQKU4a hLFg== X-Gm-Message-State: ALoCoQn8mNyG/EjZezHIPpN4cD9DXDTNCLqisOIeVeW5z4CTuawUJKD6baL1WO+NTGF3Inl+cAkl X-Received: by 10.194.176.162 with SMTP id cj2mr16652967wjc.93.1427282172268; Wed, 25 Mar 2015 04:16:12 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id g8sm3765066wiy.19.2015.03.25.04.16.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 04:16:11 -0700 (PDT) Message-ID: <551298F9.8030306@profitbricks.com> Date: Wed, 25 Mar 2015 12:16:09 +0100 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, Ira Weiny CC: "J. Bruce Fields" , Trond Myklebust , "David S. Miller" , Moni Shoua , PJ Waskiewicz , Steve Wise , Tatyana Nikolova , Yan Burman , Jack Morgenstein , Yann Droneaud , Bart Van Assche , Colin Ian King , Mel Gorman , Majd Dibbiny , Jiri Kosina , Matan Barak , Dan Carpenter , Eugenia Emantayev , Doug Ledford , Alex Estrin , Erez Shitrit , Eric Dumazet , Tom Gundersen , Sagi Grimberg , Haggai Eran , Shachar Raindel , Mike Marciniszyn , Tom Tucker , Chuck Lever Subject: [PATCH 2/2] IB/Verbs: Use helpers to check IBoE technology References: <55129832.2070707@profitbricks.com> In-Reply-To: <55129832.2070707@profitbricks.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch will introduce rdma_tech_is_iboe() and use it to save some code. Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- drivers/infiniband/core/cma.c | 6 ++---- include/rdma/ib_verbs.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 668e955..d354857 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -375,8 +375,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num) == dev_ll) { cma_dev = listen_id_priv->cma_dev; port = listen_id_priv->id.port_num; - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else @@ -395,8 +394,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num == port) continue; if (rdma_port_get_link_layer(cma_dev->device, port) == dev_ll) { - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else ret = ib_find_cached_gid(cma_dev->device, &gid, &found_port, NULL); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 2bf9094..9a811f8 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1767,6 +1767,12 @@ static inline int rdma_port_ll_is_eth(struct ib_device *device, u8 port_num) == IB_LINK_LAYER_ETHERNET; } +static inline int rdma_tech_is_iboe(struct ib_device *device, u8 port_num) +{ + return rdma_transport_is_ib(device) && + rdma_port_ll_is_eth(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);