Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / infiniband / core / cache.c

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index c9e9fc8..0c98dd3 100644 (file)
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1429,7 +1429,7 @@ int rdma_read_gid_l2_fields(const struct ib_gid_attr *attr,
 EXPORT_SYMBOL(rdma_read_gid_l2_fields);
 
 static int config_non_roce_gid_cache(struct ib_device *device,
-                                    u32 port, int gid_tbl_len)
+                                    u32 port, struct ib_port_attr *tprops)
 {
        struct ib_gid_attr gid_attr = {};
        struct ib_gid_table *table;
@@ -1441,7 +1441,7 @@ static int config_non_roce_gid_cache(struct ib_device *device,
        table = rdma_gid_table(device, port);
 
        mutex_lock(&table->lock);
-       for (i = 0; i < gid_tbl_len; ++i) {
+       for (i = 0; i < tprops->gid_tbl_len; ++i) {
                if (!device->ops.query_gid)
                        continue;
                ret = device->ops.query_gid(device, port, i, &gid_attr.gid);
@@ -1452,6 +1452,8 @@ static int config_non_roce_gid_cache(struct ib_device *device,
                        goto err;
                }
                gid_attr.index = i;
+               tprops->subnet_prefix =
+                       be64_to_cpu(gid_attr.gid.global.subnet_prefix);
                add_modify_gid(table, &gid_attr);
        }
 err:
@@ -1484,7 +1486,7 @@ ib_cache_update(struct ib_device *device, u32 port, bool update_gids,
 
        if (!rdma_protocol_roce(device, port) && update_gids) {
                ret = config_non_roce_gid_cache(device, port,
-                                               tprops->gid_tbl_len);
+                                               tprops);
                if (ret)
                        goto err;
        }
@@ -1619,8 +1621,6 @@ int ib_cache_setup_one(struct ib_device *device)
        u32 p;
        int err;
 
-       rwlock_init(&device->cache_lock);
-
        err = gid_table_setup_one(device);
        if (err)
                return err;