From b76a0d8833b6280e7adaa6864d16f4e2a23cbed2 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 26 Aug 2012 19:14:10 +0200
Subject: [PATCH] --- yaml --- r: 327780 b: refs/heads/master c:
 2cf545e835aae92173ef0b1f4af385e9c40f21e8 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/net/checksum.h |  3 +++
 trunk/net/core/utils.c       | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81c5d064aba3..6ddb1b0508a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ad352cb433ed2b05921a32b5ee20410512e2320
+refs/heads/master: 2cf545e835aae92173ef0b1f4af385e9c40f21e8
diff --git a/trunk/include/net/checksum.h b/trunk/include/net/checksum.h
index ba55d8b8c87c..600d1d705bb8 100644
--- a/trunk/include/net/checksum.h
+++ b/trunk/include/net/checksum.h
@@ -109,6 +109,9 @@ static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to)
 struct sk_buff;
 extern void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
 				     __be32 from, __be32 to, int pseudohdr);
+extern void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,
+				      const __be32 *from, const __be32 *to,
+				      int pseudohdr);
 
 static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
 					    __be16 from, __be16 to,
diff --git a/trunk/net/core/utils.c b/trunk/net/core/utils.c
index 39895a65e54a..f5613d569c23 100644
--- a/trunk/net/core/utils.c
+++ b/trunk/net/core/utils.c
@@ -294,6 +294,26 @@ void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
 }
 EXPORT_SYMBOL(inet_proto_csum_replace4);
 
+void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,
+			       const __be32 *from, const __be32 *to,
+			       int pseudohdr)
+{
+	__be32 diff[] = {
+		~from[0], ~from[1], ~from[2], ~from[3],
+		to[0], to[1], to[2], to[3],
+	};
+	if (skb->ip_summed != CHECKSUM_PARTIAL) {
+		*sum = csum_fold(csum_partial(diff, sizeof(diff),
+				 ~csum_unfold(*sum)));
+		if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
+			skb->csum = ~csum_partial(diff, sizeof(diff),
+						  ~skb->csum);
+	} else if (pseudohdr)
+		*sum = ~csum_fold(csum_partial(diff, sizeof(diff),
+				  csum_unfold(*sum)));
+}
+EXPORT_SYMBOL(inet_proto_csum_replace16);
+
 int mac_pton(const char *s, u8 *mac)
 {
 	int i;