Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965492AbbDVAIQ (ORCPT ); Tue, 21 Apr 2015 20:08:16 -0400 Received: from mga09.intel.com ([134.134.136.24]:53445 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965399AbbDVAIM (ORCPT ); Tue, 21 Apr 2015 20:08:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="559745478" Date: Tue, 21 Apr 2015 20:08:05 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 13/27] IB/Verbs: Reserve legacy transport type in 'dev_addr' Message-ID: <20150422000804.GM15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BAE8.9010805@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BAE8.9010805@profitbricks.com> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2398 Lines: 70 On Mon, Apr 20, 2015 at 10:38:00AM +0200, Michael Wang wrote: > > Reserve the legacy transport type for the 'transport' member > of 'struct rdma_dev_addr' until we make sure this is no > longer needed. > > Cc: Hal Rosenstock > Cc: Steve Wise > Cc: Tom Talpey > Cc: Jason Gunthorpe > Cc: Doug Ledford > Cc: Ira Weiny > Cc: Sean Hefty > Signed-off-by: Michael Wang Reviewed-by: Ira Weiny > --- > drivers/infiniband/core/cma.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > index ebac646..6195bf6 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -244,14 +244,35 @@ static inline void cma_set_ip_ver(struct cma_hdr *hdr, u8 ip_ver) > hdr->ip_version = (ip_ver << 4) | (hdr->ip_version & 0xF); > } > > +static inline void cma_set_legacy_transport(struct rdma_cm_id *id) > +{ > + switch (id->device->node_type) { > + case RDMA_NODE_IB_CA: > + case RDMA_NODE_IB_SWITCH: > + case RDMA_NODE_IB_ROUTER: > + id->route.addr.dev_addr.transport = RDMA_TRANSPORT_IB; > + break; > + case RDMA_NODE_RNIC: > + id->route.addr.dev_addr.transport = RDMA_TRANSPORT_IWARP; > + break; > + case RDMA_NODE_USNIC: > + id->route.addr.dev_addr.transport = RDMA_TRANSPORT_USNIC; > + break; > + case RDMA_NODE_USNIC_UDP: > + id->route.addr.dev_addr.transport = RDMA_TRANSPORT_USNIC_UDP; > + break; > + default: > + BUG(); > + } > +} > + > static void cma_attach_to_dev(struct rdma_id_private *id_priv, > struct cma_device *cma_dev) > { > atomic_inc(&cma_dev->refcount); > id_priv->cma_dev = cma_dev; > id_priv->id.device = cma_dev->device; > - id_priv->id.route.addr.dev_addr.transport = > - rdma_node_get_transport(cma_dev->device->node_type); > + cma_set_legacy_transport(&id_priv->id); > list_add_tail(&id_priv->list, &cma_dev->id_list); > } > > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/