diff options
author | Simon Horman <horms@verge.net.au> | 2008-09-07 19:34:46 -0400 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2008-09-07 19:34:46 -0400 |
commit | 178f5e494e3c0252d06a9b1473016addff71e01e (patch) | |
tree | 29c7a1d7ab4c1c5ecf0226b186b137828133e0c4 | |
parent | 5af149cc34143c4e24abcc6355b29b3161eff3b8 (diff) |
IPVS: use ipv6_addr_copy()
It is standard to use ipv6_addr_copy() to fill in
the in6 element of a union nf_inet_addr snet.
Thanks to Julius Volz for pointing this out.
Cc: Brian Haley <brian.haley@hp.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Julius Volz <juliusv@google.com>
-rw-r--r-- | net/ipv4/ipvs/ip_vs_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c index 1f4f3b943595..f5180ac56be3 100644 --- a/net/ipv4/ipvs/ip_vs_core.c +++ b/net/ipv4/ipvs/ip_vs_core.c | |||
@@ -847,7 +847,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related) | |||
847 | if (!cp) | 847 | if (!cp) |
848 | return NF_ACCEPT; | 848 | return NF_ACCEPT; |
849 | 849 | ||
850 | snet.in6 = iph->saddr; | 850 | ipv6_addr_copy(&snet.in6, &iph->saddr); |
851 | return handle_response_icmp(AF_INET6, skb, &snet, cih->nexthdr, cp, | 851 | return handle_response_icmp(AF_INET6, skb, &snet, cih->nexthdr, cp, |
852 | pp, offset, sizeof(struct ipv6hdr)); | 852 | pp, offset, sizeof(struct ipv6hdr)); |
853 | } | 853 | } |
@@ -1227,7 +1227,7 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum) | |||
1227 | /* The packet could also belong to a local client */ | 1227 | /* The packet could also belong to a local client */ |
1228 | cp = pp->conn_out_get(AF_INET6, skb, pp, &ciph, offset, 1); | 1228 | cp = pp->conn_out_get(AF_INET6, skb, pp, &ciph, offset, 1); |
1229 | if (cp) { | 1229 | if (cp) { |
1230 | snet.in6 = iph->saddr; | 1230 | ipv6_addr_copy(&snet.in6, &iph->saddr); |
1231 | return handle_response_icmp(AF_INET6, skb, &snet, | 1231 | return handle_response_icmp(AF_INET6, skb, &snet, |
1232 | cih->nexthdr, | 1232 | cih->nexthdr, |
1233 | cp, pp, offset, | 1233 | cp, pp, offset, |