Merge branch 'for-4.3/gembird' into for-linus

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index fa17b552ff78..2cb865c7ce7a 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 (!rdma_cap_ib_mcast(dev->device, event->element.port_num))
                 return;
 
         index = event->element.port_num - dev->start_port;
@@ -808,24 +807,16 @@ 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)
                 return;
 
-        if (device->node_type == RDMA_NODE_IB_SWITCH)
-                dev->start_port = dev->end_port = 0;
-        else {
-                dev->start_port = 1;
-                dev->end_port = device->phys_port_cnt;
-        }
+        dev->start_port = rdma_start_port(device);
+        dev->end_port = rdma_end_port(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_cap_ib_mcast(device, dev->start_port + i))
                         continue;
                 port = &dev->port[i];
                 port->dev = dev;
@@ -863,8 +854,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_cap_ib_mcast(device, dev->start_port + i)) {
                         port = &dev->port[i];
                         deref_port(port);
                         wait_for_completion(&port->comp);