korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 14:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

IB/Verbs: Reform IB-core multicast

Browse Source 
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>
This commit is contained in:
Michael Wang 2015-05-05 14:50:23 +02:00 committed by Doug Ledford
parent 08e3681ab8
commit 613466cb7f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/infiniband/core/multicast.c
View File

@ -780,8 +780,7 @@ static void mcast_event_handler(struct ib_event_handler *handler,
int index; int index;
dev = container_of(handler, struct mcast_device, event_handler); dev = container_of(handler, struct mcast_device, event_handler);
if (rdma_port_get_link_layer(dev->device, event->element.port_num) != if (WARN_ON(!rdma_protocol_ib(dev->device, event->element.port_num)))
IB_LINK_LAYER_INFINIBAND)
return; return;
index = event->element.port_num - dev->start_port; index = event->element.port_num - dev->start_port;
@ -808,9 +807,6 @@ static void mcast_add_one(struct ib_device *device)
int i; int i;
int count = 0; 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, dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port,
GFP_KERNEL); GFP_KERNEL);
if (!dev) 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++) { for (i = 0; i <= dev->end_port - dev->start_port; i++) {
if (rdma_port_get_link_layer(device, dev->start_port + i) != if (!rdma_protocol_ib(device, dev->start_port + i))
IB_LINK_LAYER_INFINIBAND)
continue; continue;
port = &dev->port[i]; port = &dev->port[i];
port->dev = dev; port->dev = dev;
@ -863,8 +858,7 @@ static void mcast_remove_one(struct ib_device *device)
flush_workqueue(mcast_wq); flush_workqueue(mcast_wq);
for (i = 0; i <= dev->end_port - dev->start_port; i++) { for (i = 0; i <= dev->end_port - dev->start_port; i++) {
if (rdma_port_get_link_layer(device, dev->start_port + i) == if (rdma_protocol_ib(device, dev->start_port + i)) {
IB_LINK_LAYER_INFINIBAND) {
port = &dev->port[i]; port = &dev->port[i];
deref_port(port); deref_port(port);
wait_for_completion(&port->comp); wait_for_completion(&port->comp);