summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorParav Pandit <parav@mellanox.com>2018-07-29 04:53:10 -0400
committerJason Gunthorpe <jgg@mellanox.com>2018-07-30 22:49:04 -0400
commit2df7dba855e10cca8eddcd38bca825446ea10e1d (patch)
tree3d93619a1c5ac1153be6d3026831c69c45042bb3
parent219d2e9dfda9431b808c28d5efc74b404b95b638 (diff)
RDMA/core: Constify dst_addr argument
Following APIs are not supposed to modify addr or dest_addr contents. Therefore make those function argument const for better code readability. 1. rdma_resolve_ip() 2. rdma_addr_size() 3. rdma_resolve_addr() Signed-off-by: Parav Pandit <parav@mellanox.com> Reviewed-by: Daniel Jurgens <danielj@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--drivers/infiniband/core/addr.c4
-rw-r--r--drivers/infiniband/core/cma.c14
-rw-r--r--include/rdma/ib_addr.h4
-rw-r--r--include/rdma/rdma_cm.h2
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 1b817fdb97a4..46b855a42884 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -188,7 +188,7 @@ static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr,
188 return -ENODATA; 188 return -ENODATA;
189} 189}
190 190
191int rdma_addr_size(struct sockaddr *addr) 191int rdma_addr_size(const struct sockaddr *addr)
192{ 192{
193 switch (addr->sa_family) { 193 switch (addr->sa_family) {
194 case AF_INET: 194 case AF_INET:
@@ -585,7 +585,7 @@ static void process_one_req(struct work_struct *_work)
585 spin_unlock_bh(&lock); 585 spin_unlock_bh(&lock);
586} 586}
587 587
588int rdma_resolve_ip(struct sockaddr *src_addr, struct sockaddr *dst_addr, 588int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
589 struct rdma_dev_addr *addr, int timeout_ms, 589 struct rdma_dev_addr *addr, int timeout_ms,
590 void (*callback)(int status, struct sockaddr *src_addr, 590 void (*callback)(int status, struct sockaddr *src_addr,
591 struct rdma_dev_addr *addr, void *context), 591 struct rdma_dev_addr *addr, void *context),
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 0794b99d2507..f326965a0616 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1046,7 +1046,7 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
1046} 1046}
1047EXPORT_SYMBOL(rdma_init_qp_attr); 1047EXPORT_SYMBOL(rdma_init_qp_attr);
1048 1048
1049static inline int cma_zero_addr(struct sockaddr *addr) 1049static inline int cma_zero_addr(const struct sockaddr *addr)
1050{ 1050{
1051 switch (addr->sa_family) { 1051 switch (addr->sa_family) {
1052 case AF_INET: 1052 case AF_INET:
@@ -1060,7 +1060,7 @@ static inline int cma_zero_addr(struct sockaddr *addr)
1060 } 1060 }
1061} 1061}
1062 1062
1063static inline int cma_loopback_addr(struct sockaddr *addr) 1063static inline int cma_loopback_addr(const struct sockaddr *addr)
1064{ 1064{
1065 switch (addr->sa_family) { 1065 switch (addr->sa_family) {
1066 case AF_INET: 1066 case AF_INET:
@@ -1074,7 +1074,7 @@ static inline int cma_loopback_addr(struct sockaddr *addr)
1074 } 1074 }
1075} 1075}
1076 1076
1077static inline int cma_any_addr(struct sockaddr *addr) 1077static inline int cma_any_addr(const struct sockaddr *addr)
1078{ 1078{
1079 return cma_zero_addr(addr) || cma_loopback_addr(addr); 1079 return cma_zero_addr(addr) || cma_loopback_addr(addr);
1080} 1080}
@@ -1097,7 +1097,7 @@ static int cma_addr_cmp(struct sockaddr *src, struct sockaddr *dst)
1097 } 1097 }
1098} 1098}
1099 1099
1100static __be16 cma_port(struct sockaddr *addr) 1100static __be16 cma_port(const struct sockaddr *addr)
1101{ 1101{
1102 struct sockaddr_ib *sib; 1102 struct sockaddr_ib *sib;
1103 1103
@@ -1115,7 +1115,7 @@ static __be16 cma_port(struct sockaddr *addr)
1115 } 1115 }
1116} 1116}
1117 1117
1118static inline int cma_any_port(struct sockaddr *addr) 1118static inline int cma_any_port(const struct sockaddr *addr)
1119{ 1119{
1120 return !cma_port(addr); 1120 return !cma_port(addr);
1121} 1121}
@@ -2944,7 +2944,7 @@ err:
2944} 2944}
2945 2945
2946static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, 2946static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
2947 struct sockaddr *dst_addr) 2947 const struct sockaddr *dst_addr)
2948{ 2948{
2949 if (!src_addr || !src_addr->sa_family) { 2949 if (!src_addr || !src_addr->sa_family) {
2950 src_addr = (struct sockaddr *) &id->route.addr.src_addr; 2950 src_addr = (struct sockaddr *) &id->route.addr.src_addr;
@@ -2965,7 +2965,7 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
2965} 2965}
2966 2966
2967int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, 2967int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
2968 struct sockaddr *dst_addr, int timeout_ms) 2968 const struct sockaddr *dst_addr, int timeout_ms)
2969{ 2969{
2970 struct rdma_id_private *id_priv; 2970 struct rdma_id_private *id_priv;
2971 int ret; 2971 int ret;
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 715394f6d18a..77c7908b7d73 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -97,7 +97,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
97 * or been canceled. A status of 0 indicates success. 97 * or been canceled. A status of 0 indicates success.
98 * @context: User-specified context associated with the call. 98 * @context: User-specified context associated with the call.
99 */ 99 */
100int rdma_resolve_ip(struct sockaddr *src_addr, struct sockaddr *dst_addr, 100int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
101 struct rdma_dev_addr *addr, int timeout_ms, 101 struct rdma_dev_addr *addr, int timeout_ms,
102 void (*callback)(int status, struct sockaddr *src_addr, 102 void (*callback)(int status, struct sockaddr *src_addr,
103 struct rdma_dev_addr *addr, void *context), 103 struct rdma_dev_addr *addr, void *context),
@@ -109,7 +109,7 @@ void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
109 const struct net_device *dev, 109 const struct net_device *dev,
110 const unsigned char *dst_dev_addr); 110 const unsigned char *dst_dev_addr);
111 111
112int rdma_addr_size(struct sockaddr *addr); 112int rdma_addr_size(const struct sockaddr *addr);
113int rdma_addr_size_in6(struct sockaddr_in6 *addr); 113int rdma_addr_size_in6(struct sockaddr_in6 *addr);
114int rdma_addr_size_kss(struct __kernel_sockaddr_storage *addr); 114int rdma_addr_size_kss(struct __kernel_sockaddr_storage *addr);
115 115
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index c5c1435c129a..5d71a7f51a9f 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -192,7 +192,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr);
192 * @timeout_ms: Time to wait for resolution to complete. 192 * @timeout_ms: Time to wait for resolution to complete.
193 */ 193 */
194int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, 194int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
195 struct sockaddr *dst_addr, int timeout_ms); 195 const struct sockaddr *dst_addr, int timeout_ms);
196 196
197/** 197/**
198 * rdma_resolve_route - Resolve the RDMA address bound to the RDMA identifier 198 * rdma_resolve_route - Resolve the RDMA address bound to the RDMA identifier