Patchwork [nf-next,v2] IPVS: ICMPv6 checksum calculation

login
register
mail settings
Submitter Simon Horman
Date Aug. 25, 2010, 8:08 a.m.
Message ID <20100825080832.GA24863@verge.net.au>
Download mbox | patch
Permalink /patch/62653/
State Superseded
Delegated to: David Miller
Headers show

Comments

Simon Horman - Aug. 25, 2010, 8:08 a.m.
Cc: Xiaoyu Du <tingsrain@gmail.com>
Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

--

Xiaoyu, is this the change that you tested?
If so could you give me a Tested-by line?

Julian, could I get an ack from you?
Alternatively, if you want to take ownership of the patch,
can I get a signed-off-by from you? In that case I'll change
the From accordingly.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Anastasov - Aug. 25, 2010, 7:55 p.m.
Hello,

On Wed, 25 Aug 2010, Simon Horman wrote:

> Cc: Xiaoyu Du <tingsrain@gmail.com>
> Cc: Julian Anastasov <ja@ssi.bg>

Signed-off-by: Julian Anastasov <ja@ssi.bg>

should be enough

> Signed-off-by: Simon Horman <horms@verge.net.au>
> 
> --
> 
> Xiaoyu, is this the change that you tested?
> If so could you give me a Tested-by line?
> 
> Julian, could I get an ack from you?
> Alternatively, if you want to take ownership of the patch,
> can I get a signed-off-by from you? In that case I'll change
> the From accordingly.
> 
> Index: nf-next-2.6/net/netfilter/ipvs/ip_vs_core.c
> ===================================================================
> --- nf-next-2.6.orig/net/netfilter/ipvs/ip_vs_core.c	2010-08-25 16:57:37.000000000 +0900
> +++ nf-next-2.6/net/netfilter/ipvs/ip_vs_core.c	2010-08-25 17:02:35.000000000 +0900
> @@ -637,9 +637,11 @@ void ip_vs_nat_icmp_v6(struct sk_buff *s
>  	}
>  
>  	/* And finally the ICMP checksum */
> -	icmph->icmp6_cksum = 0;
> -	/* TODO IPv6: is this correct for ICMPv6? */
> -	ip_vs_checksum_complete(skb, icmp_offset);
> +	icmph->icmp6_cksum = ~csum_ipv6_magic(&iph->saddr, &iph->daddr,
> +					      skb->len - icmp_offset,
> +					      IPPROTO_ICMPV6, 0);
> +	skb->csum_start = skb_network_header(skb) - skb->head + icmp_offset;
> +	skb->csum_offset = offsetof(struct icmp6hdr, icmp6_cksum);
>  	skb->ip_summed = CHECKSUM_UNNECESSARY;
>  
>  	if (inout)
> 

Regards

--
Julian Anastasov <ja@ssi.bg>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: nf-next-2.6/net/netfilter/ipvs/ip_vs_core.c
===================================================================
--- nf-next-2.6.orig/net/netfilter/ipvs/ip_vs_core.c	2010-08-25 16:57:37.000000000 +0900
+++ nf-next-2.6/net/netfilter/ipvs/ip_vs_core.c	2010-08-25 17:02:35.000000000 +0900
@@ -637,9 +637,11 @@  void ip_vs_nat_icmp_v6(struct sk_buff *s
 	}
 
 	/* And finally the ICMP checksum */
-	icmph->icmp6_cksum = 0;
-	/* TODO IPv6: is this correct for ICMPv6? */
-	ip_vs_checksum_complete(skb, icmp_offset);
+	icmph->icmp6_cksum = ~csum_ipv6_magic(&iph->saddr, &iph->daddr,
+					      skb->len - icmp_offset,
+					      IPPROTO_ICMPV6, 0);
+	skb->csum_start = skb_network_header(skb) - skb->head + icmp_offset;
+	skb->csum_offset = offsetof(struct icmp6hdr, icmp6_cksum);
 	skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 	if (inout)