From: Simon Horman <horms@verge.net.au>
To: linux-kernel@vger.kernel.org, lvs-devel@vger.kernel.org,
netfilter-devel@vger.kernel.org
Cc: Patrick McHardy <kaber@trash.net>, Xiaoyu Du <tingsrain@gmail.com>
Subject: [patch nf-next] IPVS: ICMPv6 checksum calculation
Date: Tue, 17 Aug 2010 16:00:43 +0900 [thread overview]
Message-ID: <20100817070036.GB742@verge.net.au> (raw)
From: Xiaoyu Du <tingsrain@gmail.com>
Correct the ICMPv6 checksum calculation when IPv6 is is used
Signed-off-by: Xiaoyu Du <tingsrain@gmail.com>
Signed-off-by: Simon Horman <horms@verge.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)
--
next reply other threads:[~2010-08-17 7:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 7:00 Simon Horman [this message]
2010-08-17 9:25 ` Julian Anastasov
2010-08-18 0:21 ` Simon Horman
2010-08-18 0:26 ` David Miller
2010-08-18 4:20 ` xiaoyu Du
2010-08-18 5:57 ` Simon Horman
2010-08-20 11:14 ` xiaoyu Du
2010-08-20 13:48 ` Julian Anastasov
2010-08-23 2:54 ` xiaoyu Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100817070036.GB742@verge.net.au \
--to=horms@verge.net.au \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=lvs-devel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=tingsrain@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®