Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965377AbbDVAGV (ORCPT ); Tue, 21 Apr 2015 20:06:21 -0400 Received: from mga03.intel.com ([134.134.136.65]:2094 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965362AbbDVAGQ (ORCPT ); Tue, 21 Apr 2015 20:06:16 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="559744866" Date: Tue, 21 Apr 2015 20:06:11 -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 06/27] IB/Verbs: Reform IB-core multicast Message-ID: <20150422000610.GG15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BA28.8040905@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BA28.8040905@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: 2636 Lines: 70 On Mon, Apr 20, 2015 at 10:34:48AM +0200, Michael Wang wrote: > > Use raw management helpers to reform IB-core multicast. > > 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/multicast.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c > index fa17b55..24d93f5 100644 > --- a/drivers/infiniband/core/multicast.c > +++ b/drivers/infiniband/core/multicast.c > @@ -780,8 +780,7 @@ static void mcast_event_handler(struct ib_event_handler *handler, > int index; > > dev = container_of(handler, struct mcast_device, event_handler); > - if (rdma_port_get_link_layer(dev->device, event->element.port_num) != > - IB_LINK_LAYER_INFINIBAND) > + if (WARN_ON(!rdma_tech_ib(dev->device, event->element.port_num))) > return; > > index = event->element.port_num - dev->start_port; > @@ -808,9 +807,6 @@ static void mcast_add_one(struct ib_device *device) > int i; > int count = 0; > > - if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB) > - return; > - > dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port, > GFP_KERNEL); > if (!dev) > @@ -824,8 +820,7 @@ static void mcast_add_one(struct ib_device *device) > } > > for (i = 0; i <= dev->end_port - dev->start_port; i++) { > - if (rdma_port_get_link_layer(device, dev->start_port + i) != > - IB_LINK_LAYER_INFINIBAND) > + if (!rdma_tech_ib(device, dev->start_port + i)) > continue; > port = &dev->port[i]; > port->dev = dev; > @@ -863,8 +858,7 @@ static void mcast_remove_one(struct ib_device *device) > flush_workqueue(mcast_wq); > > for (i = 0; i <= dev->end_port - dev->start_port; i++) { > - if (rdma_port_get_link_layer(device, dev->start_port + i) == > - IB_LINK_LAYER_INFINIBAND) { > + if (rdma_tech_ib(device, dev->start_port + i)) { > port = &dev->port[i]; > deref_port(port); > wait_for_completion(&port->comp); > -- > 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/