IB/core: Rename ib_query_ah to rdma_query_ah

Rename ib_query_ah to rdma_query_ah so its in sync with the
rename of the ib address handle attribute

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Don Hiatt <don.hiatt@intel.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 6d8c9eece155a249358360224c87077fd26ccc2d..309c7f3f02199eb9e4fa3daed010d537dde88ce1 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1847,7 +1847,7 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_
                /* both requests, or both responses. GIDs different */
                return 0;
 
-       if (ib_query_ah(wr->send_buf.ah, &attr))
+       if (rdma_query_ah(wr->send_buf.ah, &attr))
                /* Assume not equal, to avoid false positives. */
                return 0;
 

diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 3536dcfa852a6a976e15ebb6a58c119c0d302325..0e597c812579a233a2fef56c29b10c124459ed62 100644 (file)
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -867,7 +867,7 @@ static int init_newwin(struct ib_mad_send_wr_private *mad_send_wr)
                    (rmpp_recv->method & IB_MGMT_METHOD_RESP))
                        continue;
 
-               if (ib_query_ah(mad_send_wr->send_buf.ah, &ah_attr))
+               if (rdma_query_ah(mad_send_wr->send_buf.ah, &ah_attr))
                        continue;
 
                if (rmpp_recv->slid == ah_attr.dlid) {

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index e856547e2cc271a9dd302baaff57d3fe6cb93b1c..35efff65f340d8c2f5a3cd738e9a9ae89a4dab68 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -579,13 +579,13 @@ int rdma_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)
 }
 EXPORT_SYMBOL(rdma_modify_ah);
 
-int ib_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)
+int rdma_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)
 {
        return ah->device->query_ah ?
                ah->device->query_ah(ah, ah_attr) :
                -ENOSYS;
 }
-EXPORT_SYMBOL(ib_query_ah);
+EXPORT_SYMBOL(rdma_query_ah);
 
 int ib_destroy_ah(struct ib_ah *ah)
 {

diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
index 492eded88afbcc281a991f423c0a0eeb311791d6..eb009045643d59047cba1dedb71fb5d4af1a2994 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
@@ -237,7 +237,7 @@ static int send_mad_to_slave(int slave, struct mlx4_ib_demux_ctx *ctx,
        if (!agent)
                return -EAGAIN;
 
-       ib_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr);
+       rdma_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr);
 
        if (ib_find_cached_pkey(&dev->ib_dev, ctx->port, IB_DEFAULT_PKEY_FULL, &wc.pkey_index))
                return -EINVAL;

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 73fb465e88fce6e9b99993726957552bec0992b1..16fd94026d497eac765056bf764d078342fd782e 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2787,13 +2787,13 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc,
 int rdma_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
 
 /**
- * ib_query_ah - Queries the address vector associated with an address
+ * rdma_query_ah - Queries the address vector associated with an address
  *   handle.
  * @ah: The address handle to query.
  * @ah_attr: The address vector attributes associated with the address
  *   handle.
  */
-int ib_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
+int rdma_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
 
 /**
  * ib_destroy_ah - Destroys an address handle.