On Mon, Apr 20, 2015 at 10:35:15AM +0200, Michael Wang wrote:
>
> Use raw management helpers to reform IB-ulp ipoib.
>
> Cc: Hal Rosenstock <h...@dev.mellanox.co.il>
> Cc: Steve Wise <sw...@opengridcomputing.com>
> Cc: Tom Talpey <t...@talpey.com>
> Cc: Jason Gunthorpe <jguntho...@obsidianresearch.com>
> Cc: Doug Ledford <dledf...@redhat.com>
> Cc: Ira Weiny <ira.we...@intel.com>
> Cc: Sean Hefty <sean.he...@intel.com>
> Signed-off-by: Michael Wang <yun.w...@profitbricks.com>
Reviewed-by: Ira Weiny <ira.we...@intel.com>
> ---
> drivers/infiniband/ulp/ipoib/ipoib_main.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> index 58b5aa3..60b379d 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> @@ -1654,9 +1654,7 @@ static void ipoib_add_one(struct ib_device *device)
> struct net_device *dev;
> struct ipoib_dev_priv *priv;
> int s, e, p;
> -
> - if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
> - return;
> + int count = 0;
>
> dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);
> if (!dev_list)
> @@ -1673,15 +1671,21 @@ static void ipoib_add_one(struct ib_device *device)
> }
>
> for (p = s; p <= e; ++p) {
> - if (rdma_port_get_link_layer(device, p) !=
> IB_LINK_LAYER_INFINIBAND)
> + if (!rdma_tech_ib(device, p))
> continue;
> dev = ipoib_add_port("ib%d", device, p);
> if (!IS_ERR(dev)) {
> priv = netdev_priv(dev);
> list_add_tail(&priv->list, dev_list);
> + count++;
> }
> }
>
> + if (!count) {
> + kfree(dev_list);
> + return;
> + }
> +
> ib_set_client_data(device, &ipoib_client, dev_list);
> }
>
> @@ -1690,9 +1694,6 @@ static void ipoib_remove_one(struct ib_device *device)
> struct ipoib_dev_priv *priv, *tmp;
> struct list_head *dev_list;
>
> - if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
> - return;
> -
> dev_list = ib_get_client_data(device, &ipoib_client);
> if (!dev_list)
> return;
> --
> 2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
