IB/Verbs: Reform IB-core multicast

Use raw management helpers to reform IB-core multicast.

Signed-off-by: Michael Wang <yun.wang@profitbricks.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Tested-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index fa17b552ff78bc16b1547215682f26649f5af7ac..b57ed03a487e675e59527abd2465581f77f28a86 100644 (file)
--- 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_protocol_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_protocol_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_protocol_ib(device, dev->start_port + i)) {
                        port = &dev->port[i];
                        deref_port(port);
                        wait_for_completion(&port->comp);