Initialize umad context only for Infiniband (as opposed to Ethernet) ports.

Signed-off-by: Eli Cohen <e...@mellanox.co.il>
---
 drivers/infiniband/core/user_mad.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/core/user_mad.c 
b/drivers/infiniband/core/user_mad.c
index 7de0296..e962c5a 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1138,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_link_layer(device, i) == IB_LINK_LAYER_INFINIBAND)
+                       if (ib_umad_init_port(device, i, &umad_dev->port[i - 
s]))
+                               goto err;
        }
 
        ib_set_client_data(device, &umad_client, umad_dev);
@@ -1148,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_link_layer(device, i) == IB_LINK_LAYER_INFINIBAND)
+                       ib_umad_kill_port(&umad_dev->port[i - s]);
 
        kref_put(&umad_dev->ref, ib_umad_release_dev);
 }
@@ -1162,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_link_layer(device, i + 1) == 
IB_LINK_LAYER_INFINIBAND)
+                       ib_umad_kill_port(&umad_dev->port[i]);
 
        kref_put(&umad_dev->ref, ib_umad_release_dev);
 }
-- 
1.7.0

_______________________________________________
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg

Reply via email to