aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2011-11-20 22:39:03 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-22 16:43:32 -0500
commit4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6 (patch)
treeda3fbec7672ac6b967dfa31cec6c88f468a57fa2 /drivers/infiniband/core
parent40ba84993d66469d336099c5af74c3da5b73e28d (diff)
net: remove ipv6_addr_copy()
C assignment can handle struct in6_addr copying. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/core')
-rw-r--r--drivers/infiniband/core/addr.c6
-rw-r--r--drivers/infiniband/core/cma.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 691276bafd78..adf0757280ed 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -243,8 +243,8 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
243 int ret; 243 int ret;
244 244
245 memset(&fl6, 0, sizeof fl6); 245 memset(&fl6, 0, sizeof fl6);
246 ipv6_addr_copy(&fl6.daddr, &dst_in->sin6_addr); 246 fl6.daddr = dst_in->sin6_addr;
247 ipv6_addr_copy(&fl6.saddr, &src_in->sin6_addr); 247 fl6.saddr = src_in->sin6_addr;
248 fl6.flowi6_oif = addr->bound_dev_if; 248 fl6.flowi6_oif = addr->bound_dev_if;
249 249
250 dst = ip6_route_output(&init_net, NULL, &fl6); 250 dst = ip6_route_output(&init_net, NULL, &fl6);
@@ -258,7 +258,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
258 goto put; 258 goto put;
259 259
260 src_in->sin6_family = AF_INET6; 260 src_in->sin6_family = AF_INET6;
261 ipv6_addr_copy(&src_in->sin6_addr, &fl6.saddr); 261 src_in->sin6_addr = fl6.saddr;
262 } 262 }
263 263
264 if (dst->dev->flags & IFF_LOOPBACK) { 264 if (dst->dev->flags & IFF_LOOPBACK) {
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 75ff821c0af0..09e66cce05d3 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2005,11 +2005,11 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
2005 if (cma_zero_addr(src)) { 2005 if (cma_zero_addr(src)) {
2006 dst = (struct sockaddr *) &id_priv->id.route.addr.dst_addr; 2006 dst = (struct sockaddr *) &id_priv->id.route.addr.dst_addr;
2007 if ((src->sa_family = dst->sa_family) == AF_INET) { 2007 if ((src->sa_family = dst->sa_family) == AF_INET) {
2008 ((struct sockaddr_in *) src)->sin_addr.s_addr = 2008 ((struct sockaddr_in *)src)->sin_addr =
2009 ((struct sockaddr_in *) dst)->sin_addr.s_addr; 2009 ((struct sockaddr_in *)dst)->sin_addr;
2010 } else { 2010 } else {
2011 ipv6_addr_copy(&((struct sockaddr_in6 *) src)->sin6_addr, 2011 ((struct sockaddr_in6 *)src)->sin6_addr =
2012 &((struct sockaddr_in6 *) dst)->sin6_addr); 2012 ((struct sockaddr_in6 *)dst)->sin6_addr;
2013 } 2013 }
2014 } 2014 }
2015 2015