1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index b4b22576f12..4f258c88c1b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1240,6 +1240,7 @@ static struct net_device *ipoib_add_port(const char *format,
                 goto alloc_mem_failed;
 
         SET_NETDEV_DEV(priv->dev, hca->dma_device);
+        priv->dev->dev_id = port - 1;
 
         if (!ib_query_port(hca, port, &attr))
                 priv->max_ib_mtu = ib_mtu_enum_to_int(attr.max_mtu);
@@ -1362,6 +1363,8 @@ static void ipoib_add_one(struct ib_device *device)
         }
 
         for (p = s; p <= e; ++p) {
+                if (rdma_port_get_link_layer(device, p) != IB_LINK_LAYER_INFINIBAND)
+                        continue;
                 dev = ipoib_add_port("ib%d", device, p);
                 if (!IS_ERR(dev)) {
                         priv = netdev_priv(dev);