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>

8 files changed, 15 insertions, 15 deletions

diff --git a/net/netfilter/ipset/ip_set_hash_ip.c b/net/netfilter/ipset/ip_set_hash_ip.c
index f2d576e6b769..4015fcaf87bc 100644
--- a/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/net/netfilter/ipset/ip_set_hash_ip.c
@@ -241,7 +241,7 @@ hash_ip6_data_isnull(const struct hash_ip6_elem *elem)
 static inline void
 hash_ip6_data_copy(struct hash_ip6_elem *dst, const struct hash_ip6_elem *src)
 {
-        ipv6_addr_copy(&dst->ip.in6, &src->ip.in6);
+        dst->ip.in6 = src->ip.in6;
 }
 
 static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_net.c b/net/netfilter/ipset/ip_set_hash_net.c
index 60d016541c58..28988196775e 100644
--- a/net/netfilter/ipset/ip_set_hash_net.c
+++ b/net/netfilter/ipset/ip_set_hash_net.c
@@ -267,7 +267,7 @@ static inline void
 hash_net6_data_copy(struct hash_net6_elem *dst,
                     const struct hash_net6_elem *src)
 {
-        ipv6_addr_copy(&dst->ip.in6, &src->ip.in6);
+        dst->ip.in6 = src->ip.in6;
         dst->cidr = src->cidr;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 093cc327020f..611c3359b94d 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -983,7 +983,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related,
         if (!cp)
                 return NF_ACCEPT;
 
-        ipv6_addr_copy(&snet.in6, &iph->saddr);
+        snet.in6 = iph->saddr;
         return handle_response_icmp(AF_INET6, skb, &snet, cih->nexthdr, cp,
                                     pp, offset, sizeof(struct ipv6hdr));
 }
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 3cdd479f9b5d..bcf5563e4837 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -603,9 +603,9 @@ sloop:
 #ifdef CONFIG_IP_VS_IPV6
         if (cp->af == AF_INET6) {
                 p += sizeof(struct ip_vs_sync_v6);
-                ipv6_addr_copy(&s->v6.caddr, &cp->caddr.in6);
-                ipv6_addr_copy(&s->v6.vaddr, &cp->vaddr.in6);
-                ipv6_addr_copy(&s->v6.daddr, &cp->daddr.in6);
+                s->v6.caddr = cp->caddr.in6;
+                s->v6.vaddr = cp->vaddr.in6;
+                s->v6.daddr = cp->daddr.in6;
         } else
 #endif
         {
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index aa2d7206ee8a..38a576d05b4b 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -235,7 +235,7 @@ __ip_vs_route_output_v6(struct net *net, struct in6_addr *daddr,
                         goto out_err;
                 }
         }
-        ipv6_addr_copy(ret_saddr, &fl6.saddr);
+        *ret_saddr = fl6.saddr;
         return dst;
 
 out_err:
@@ -279,7 +279,7 @@ __ip_vs_get_out_rt_v6(struct sk_buff *skb, struct ip_vs_dest *dest,
                                   atomic_read(&rt->dst.__refcnt));
                 }
                 if (ret_saddr)
-                        ipv6_addr_copy(ret_saddr, &dest->dst_saddr.in6);
+                        *ret_saddr = dest->dst_saddr.in6;
                 spin_unlock(&dest->dst_lock);
         } else {
                 dst = __ip_vs_route_output_v6(net, daddr, ret_saddr, do_xfrm);
@@ -705,7 +705,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
         /* mangle the packet */
         if (pp->dnat_handler && !pp->dnat_handler(skb, pp, cp))
                 goto tx_error;
-        ipv6_addr_copy(&ipv6_hdr(skb)->daddr, &cp->daddr.in6);
+        ipv6_hdr(skb)->daddr = cp->daddr.in6;
 
         if (!local || !skb->dev) {
                 /* drop the old route when skb is not shared */
@@ -967,8 +967,8 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
         be16_add_cpu(&iph->payload_len, sizeof(*old_iph));
         iph->priority           =       old_iph->priority;
         memset(&iph->flow_lbl, 0, sizeof(iph->flow_lbl));
-        ipv6_addr_copy(&iph->daddr, &cp->daddr.in6);
-        ipv6_addr_copy(&iph->saddr, &saddr);
+        iph->daddr = cp->daddr.in6;
+        iph->saddr = saddr;
         iph->hop_limit          =       old_iph->hop_limit;
 
         /* Another hack: avoid icmp_send in ip_fragment */
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index f03c2d4539f6..f9368f33e7af 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -750,10 +750,10 @@ static int callforward_do_filter(const union nf_inet_addr *src,
                 struct rt6_info *rt1, *rt2;
 
                 memset(&fl1, 0, sizeof(fl1));
-                ipv6_addr_copy(&fl1.daddr, &src->in6);
+                fl1.daddr = src->in6;
 
                 memset(&fl2, 0, sizeof(fl2));
-                ipv6_addr_copy(&fl2.daddr, &dst->in6);
+                fl2.daddr = dst->in6;
                 if (!afinfo->route(&init_net, (struct dst_entry **)&rt1,
                                    flowi6_to_flowi(&fl1), false)) {
                         if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
index 9e63b43faeed..3ecade3966d5 100644
--- a/net/netfilter/xt_TCPMSS.c
+++ b/net/netfilter/xt_TCPMSS.c
@@ -161,7 +161,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb,
                 struct flowi6 *fl6 = &fl.u.ip6;
 
                 memset(fl6, 0, sizeof(*fl6));
-                ipv6_addr_copy(&fl6->daddr, &ipv6_hdr(skb)->saddr);
+                fl6->daddr = ipv6_hdr(skb)->saddr;
         }
         rcu_read_lock();
         ai = nf_get_afinfo(family);
diff --git a/net/netfilter/xt_addrtype.c b/net/netfilter/xt_addrtype.c
index b77d383cec78..c047de2046ad 100644
--- a/net/netfilter/xt_addrtype.c
+++ b/net/netfilter/xt_addrtype.c
@@ -42,7 +42,7 @@ static u32 match_lookup_rt6(struct net *net, const struct net_device *dev,
         int route_err;
 
         memset(&flow, 0, sizeof(flow));
-        ipv6_addr_copy(&flow.daddr, addr);
+        flow.daddr = *addr;
         if (dev)
                 flow.flowi6_oif = dev->ifindex;