]> granicus.if.org Git - ipset/commitdiff
net: remove ipv6_addr_copy()
authorAlexey Dobriyan <adobriyan@gmail.com>
Thu, 19 Apr 2012 15:34:32 +0000 (17:34 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 19 Apr 2012 15:34:32 +0000 (17:34 +0200)
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>
kernel/net/netfilter/ipset/ip_set_hash_ip.c
kernel/net/netfilter/ipset/ip_set_hash_net.c

index 14a8628f10063103a783ca23bf2666411a75fda8..5139dea6019e44ba24ee01d9c4f65beb3eddfe61 100644 (file)
@@ -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
index eb8e6d4d66e1dfa8c608b2499ee1bc96b908dc94..7c3d945517cfa55c62faeccb24d6bce29c958faa 100644 (file)
@@ -295,7 +295,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;
        dst->nomatch = src->nomatch;
 }