IB/{core, cm, cma, ipoib}: Rename ib_init_ah_from_path to ib_init_ah_attr_from_path

Since ib_init_ah_from_path initializes the address handle attribute, it is
renamed to reflect so.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index c8fc92fdff768eb022c64bae80510bf13f16c747..5af1c1c168b7637bff5b3f1661a07ecf162ec024 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -494,8 +494,8 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
                return ret;
 
        av->port = port;
-       ret = ib_init_ah_from_path(cm_dev->ib_device, port->port_num, path,
-                                  &av->ah_attr);
+       ret = ib_init_ah_attr_from_path(cm_dev->ib_device, port->port_num, path,
+                                       &av->ah_attr);
        if (ret)
                return ret;
 

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 19769ea4d71f4a28026580b96ee4aac8c6db4bd5..5ab646a2408922fb816cd82d974e0291205cc317 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -3396,9 +3396,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
                        event.status = ret;
                        break;
                }
-               ib_init_ah_from_path(id_priv->id.device, id_priv->id.port_num,
-                                    id_priv->id.route.path_rec,
-                                    &event.param.ud.ah_attr);
+               ib_init_ah_attr_from_path(id_priv->id.device,
+                                         id_priv->id.port_num,
+                                         id_priv->id.route.path_rec,
+                                         &event.param.ud.ah_attr);
                event.param.ud.qp_num = rep->qpn;
                event.param.ud.qkey = rep->qkey;
                event.event = RDMA_CM_EVENT_ESTABLISHED;

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index ab5e1024fea91ae5ae5b660af1899000775fce5e..7cd37e77debb7ec4892babdce1c4040c7ba46f2c 100644 (file)
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -1227,9 +1227,9 @@ static u8 get_src_path_mask(struct ib_device *device, u8 port_num)
        return src_path_mask;
 }
 
-int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
-                        struct sa_path_rec *rec,
-                        struct rdma_ah_attr *ah_attr)
+int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num,
+                             struct sa_path_rec *rec,
+                             struct rdma_ah_attr *ah_attr)
 {
        int ret;
        u16 gid_index;
@@ -1341,7 +1341,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
 
        return 0;
 }
-EXPORT_SYMBOL(ib_init_ah_from_path);
+EXPORT_SYMBOL(ib_init_ah_attr_from_path);
 
 static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
 {

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index c182604076e184e4233a7fc079265ccb5e5ae0d1..cb79be1a1474eacf7ea9cfa6c664c3f5c00ae518 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -768,7 +768,8 @@ static void path_rec_completion(int status,
        if (!status) {
                struct rdma_ah_attr av;
 
-               if (!ib_init_ah_from_path(priv->ca, priv->port, pathrec, &av))
+               if (!ib_init_ah_attr_from_path(priv->ca, priv->port,
+                                              pathrec, &av))
                        ah = ipoib_create_ah(dev, priv->pd, &av);
        }
 

diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 1f7f604db5aa5750ad08776e2ad0bca4c52dfe8d..811cfcfcbe3d4e7632c999d2c5793503bae55c7c 100644 (file)
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -549,12 +549,12 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
                             struct rdma_ah_attr *ah_attr);
 
 /**
- * ib_init_ah_from_path - Initialize address handle attributes based on an SA
- *   path record.
+ * ib_init_ah_attr_from_path - Initialize address handle attributes based on
+ *   an SA path record.
  */
-int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
-                        struct sa_path_rec *rec,
-                        struct rdma_ah_attr *ah_attr);
+int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num,
+                             struct sa_path_rec *rec,
+                             struct rdma_ah_attr *ah_attr);
 
 /**
  * ib_sa_pack_path - Conert a path record from struct ib_sa_path_rec