IB/umad: Enable support only for IB ports
Subsystems (3)
PATCH v6 4/10 IB/umad: Enable support only for IB ports
Initialize umad context for devices that have any of their ports IB. Since devices may have ports of two different protocols (for example, RDMA_TRANSPORT_IB and RDMA_TRANSPORT_RDMAOE), ib_umad_add_one() needs to succeed if any of the ports is IB but ib_umad_init_port() is called only for IB ports.
Signed-off-by Eli Cohen <[email protected]>
--- drivers/infiniband/core/user_mad.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
drivers/infiniband/core/user_mad.c +7 -8
@@ -1124,10 +1124,6 @@ static void ib_umad_add_one(struct ib_device *device) e = device->phys_port_cnt; } -for (i = s; i <= e; ++i) -if (rdma_port_get_transport (device, i) !=RDMA_TRANSPORT_IB ) -return ; - umad_dev =kzalloc (sizeof *umad_dev + (e - s +1 ) *sizeof (struct ib_umad_port ),GFP_KERNEL );
@@ -1142,8 +1138,9 @@ static void ib_umad_add_one(struct ib_device *device)for (i = s; i <= e; ++i) { umad_dev->port[i - s].umad_dev = umad_dev; -if (ib_umad_init_port (device, i, &umad_dev->port[i - s])) - goto err; +if (rdma_port_get_transport (device, i) ==RDMA_TRANSPORT_IB ) +if (ib_umad_init_port (device, i, &umad_dev->port[i - s])) + goto err; }ib_set_client_data (device, &umad_client, umad_dev);
@@ -1152,7 +1149,8 @@ static void ib_umad_add_one(struct ib_device *device) err:while (--i >= s) -ib_umad_kill_port (&umad_dev->port[i - s]); +if (rdma_port_get_transport (device, i) ==RDMA_TRANSPORT_IB ) +ib_umad_kill_port (&umad_dev->port[i - s]);kref_put (&umad_dev->ref, ib_umad_release_dev); }
@@ -1166,7 +1164,8 @@ static void ib_umad_remove_one(struct ib_device *device)return ;for (i =0 ; i <= umad_dev->end_port - umad_dev->start_port; ++i) -ib_umad_kill_port (&umad_dev->port[i]); +if (rdma_port_get_transport (device, i +1 ) ==RDMA_TRANSPORT_IB ) +ib_umad_kill_port (&umad_dev->port[i]);kref_put (&umad_dev->ref, ib_umad_release_dev); }
Signature · 1 line
1.6.5.2