Commit 4e3fd7a0 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: remove ipv6_addr_copy() 



C assignment can handle struct in6_addr copying.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40ba8499

drivers/infiniband/core/addr.c

+3 −3
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 
	int ret;



	memset(&fl6, 0, sizeof fl6);

	ipv6_addr_copy(&fl6.daddr, &dst_in->sin6_addr);

	ipv6_addr_copy(&fl6.saddr, &src_in->sin6_addr);

	fl6.daddr = dst_in->sin6_addr;

	fl6.saddr = src_in->sin6_addr;

	fl6.flowi6_oif = addr->bound_dev_if;



	dst = ip6_route_output(&init_net, NULL, &fl6);
@@ -258,7 +258,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 
			goto put;



		src_in->sin6_family = AF_INET6;

		ipv6_addr_copy(&src_in->sin6_addr, &fl6.saddr);

		src_in->sin6_addr = fl6.saddr;

	}



	if (dst->dev->flags & IFF_LOOPBACK) {

drivers/infiniband/core/cma.c

+4 −4
Original line number Diff line number Diff line
@@ -2005,11 +2005,11 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv) 
	if (cma_zero_addr(src)) {

		dst = (struct sockaddr *) &id_priv->id.route.addr.dst_addr;

		if ((src->sa_family = dst->sa_family) == AF_INET) {

			((struct sockaddr_in *) src)->sin_addr.s_addr =

				((struct sockaddr_in *) dst)->sin_addr.s_addr;

			((struct sockaddr_in *)src)->sin_addr =

				((struct sockaddr_in *)dst)->sin_addr;

		} else {

			ipv6_addr_copy(&((struct sockaddr_in6 *) src)->sin6_addr,

				       &((struct sockaddr_in6 *) dst)->sin6_addr);

			((struct sockaddr_in6 *)src)->sin6_addr =

				((struct sockaddr_in6 *)dst)->sin6_addr;

		}

	}

drivers/net/bonding/bond_ipv6.c

+3 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void bond_glean_dev_ipv6(struct net_device *dev, struct in6_addr *addr) 
		struct inet6_ifaddr *ifa

			= list_first_entry(&idev->addr_list,

					   struct inet6_ifaddr, if_list);

		ipv6_addr_copy(addr, &ifa->addr);

		*addr = ifa->addr;

	} else

		ipv6_addr_set(addr, 0, 0, 0, 0);
@@ -168,8 +168,7 @@ static int bond_inet6addr_event(struct notifier_block *this, 
			switch (event) {

			case NETDEV_UP:

				if (ipv6_addr_any(&bond->master_ipv6))

					ipv6_addr_copy(&bond->master_ipv6,

						       &ifa->addr);

					bond->master_ipv6 = ifa->addr;

				return NOTIFY_OK;

			case NETDEV_DOWN:

				if (ipv6_addr_equal(&bond->master_ipv6,
@@ -191,8 +190,7 @@ static int bond_inet6addr_event(struct notifier_block *this, 
				switch (event) {

				case NETDEV_UP:

					if (ipv6_addr_any(&vlan->vlan_ipv6))

						ipv6_addr_copy(&vlan->vlan_ipv6,

							       &ifa->addr);

						vlan->vlan_ipv6 = ifa->addr;

					return NOTIFY_OK;

				case NETDEV_DOWN:

					if (ipv6_addr_equal(&vlan->vlan_ipv6,

drivers/net/ethernet/broadcom/cnic.c

+1 −1
Original line number Diff line number Diff line
@@ -3475,7 +3475,7 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr, 
	struct flowi6 fl6;



	memset(&fl6, 0, sizeof(fl6));

	ipv6_addr_copy(&fl6.daddr, &dst_addr->sin6_addr);

	fl6.daddr = dst_addr->sin6_addr;

	if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)

		fl6.flowi6_oif = dst_addr->sin6_scope_id;

fs/dlm/lowcomms.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr) 
	} else {

		struct sockaddr_in6 *in6  = (struct sockaddr_in6 *) &addr;

		struct sockaddr_in6 *ret6 = (struct sockaddr_in6 *) retaddr;

		ipv6_addr_copy(&ret6->sin6_addr, &in6->sin6_addr);

		ret6->sin6_addr = in6->sin6_addr;

	}



	return 0;