diff options
author | Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com> | 2017-04-27 19:05:58 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-05-01 14:37:28 -0400 |
commit | c2f8fc4ec4400901e5561d4815deca19f395deb6 (patch) | |
tree | d23a16ce4b125ec09faed4c6d1ba2ef36b3d2d2c /drivers/infiniband/core/cma.c | |
parent | 82ffc226483cad8780c25c754da5d0013c88ff8c (diff) |
IB/SA: Rename ib_sa_path_rec to sa_path_rec
Rename ib_sa_path_rec to a more generic sa_path_rec.
This is part of extending ib_sa to also support OPA
path records in addition to the IB defined path records.
Reviewed-by: Don Hiatt <don.hiatt@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/cma.c')
-rw-r--r-- | drivers/infiniband/core/cma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index f3b800f28556..3af318a71622 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c | |||
@@ -1128,7 +1128,7 @@ static inline int cma_any_port(struct sockaddr *addr) | |||
1128 | static void cma_save_ib_info(struct sockaddr *src_addr, | 1128 | static void cma_save_ib_info(struct sockaddr *src_addr, |
1129 | struct sockaddr *dst_addr, | 1129 | struct sockaddr *dst_addr, |
1130 | struct rdma_cm_id *listen_id, | 1130 | struct rdma_cm_id *listen_id, |
1131 | struct ib_sa_path_rec *path) | 1131 | struct sa_path_rec *path) |
1132 | { | 1132 | { |
1133 | struct sockaddr_ib *listen_ib, *ib; | 1133 | struct sockaddr_ib *listen_ib, *ib; |
1134 | 1134 | ||
@@ -2301,7 +2301,7 @@ void rdma_set_service_type(struct rdma_cm_id *id, int tos) | |||
2301 | } | 2301 | } |
2302 | EXPORT_SYMBOL(rdma_set_service_type); | 2302 | EXPORT_SYMBOL(rdma_set_service_type); |
2303 | 2303 | ||
2304 | static void cma_query_handler(int status, struct ib_sa_path_rec *path_rec, | 2304 | static void cma_query_handler(int status, struct sa_path_rec *path_rec, |
2305 | void *context) | 2305 | void *context) |
2306 | { | 2306 | { |
2307 | struct cma_work *work = context; | 2307 | struct cma_work *work = context; |
@@ -2328,7 +2328,7 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, | |||
2328 | struct cma_work *work) | 2328 | struct cma_work *work) |
2329 | { | 2329 | { |
2330 | struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr; | 2330 | struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr; |
2331 | struct ib_sa_path_rec path_rec; | 2331 | struct sa_path_rec path_rec; |
2332 | ib_sa_comp_mask comp_mask; | 2332 | ib_sa_comp_mask comp_mask; |
2333 | struct sockaddr_in6 *sin6; | 2333 | struct sockaddr_in6 *sin6; |
2334 | struct sockaddr_ib *sib; | 2334 | struct sockaddr_ib *sib; |
@@ -2453,7 +2453,7 @@ err1: | |||
2453 | } | 2453 | } |
2454 | 2454 | ||
2455 | int rdma_set_ib_paths(struct rdma_cm_id *id, | 2455 | int rdma_set_ib_paths(struct rdma_cm_id *id, |
2456 | struct ib_sa_path_rec *path_rec, int num_paths) | 2456 | struct sa_path_rec *path_rec, int num_paths) |
2457 | { | 2457 | { |
2458 | struct rdma_id_private *id_priv; | 2458 | struct rdma_id_private *id_priv; |
2459 | int ret; | 2459 | int ret; |