[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100817070036.GB742@verge.net.au>
Date: Tue, 17 Aug 2010 16:00:43 +0900
From: Simon Horman <horms@...ge.net.au>
To: linux-kernel@...r.kernel.org, lvs-devel@...r.kernel.org,
netfilter-devel@...r.kernel.org
Cc: Patrick McHardy <kaber@...sh.net>, Xiaoyu Du <tingsrain@...il.com>
Subject: [patch nf-next] IPVS: ICMPv6 checksum calculation
From: Xiaoyu Du <tingsrain@...il.com>
Correct the ICMPv6 checksum calculation when IPv6 is is used
Signed-off-by: Xiaoyu Du <tingsrain@...il.com>
Signed-off-by: Simon Horman <horms@...ge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
I wonder if this is -stable or .35 material.
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 4f8ddba..124a1ae 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -638,8 +638,12 @@ void ip_vs_nat_icmp_v6(struct sk_buff *skb,
struct ip_vs_protocol *pp,
/* 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,
+ skb->csum);
+
skb->ip_summed = CHECKSUM_UNNECESSARY;
if (inout)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists