From: Shile Zhang <shile.zhang@nokia.com>
Date: Sat, 4 Feb 2017 09:03:40 +0000 (+0800)
Subject: powerpc/64: Fix checksum folding in csum_add()
X-Git-Tag: MMI-PSA29.97-13-9~6024^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ad966d7303b70165228dba1ee8da1a05c10eefe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

powerpc/64: Fix checksum folding in csum_add()

Paul's patch to fix checksum folding, commit b492f7e4e07a ("powerpc/64:
Fix checksum folding in csum_tcpudp_nofold and ip_fast_csum_nofold")
missed a case in csum_add(). Fix it.

Signed-off-by: Shile Zhang <shile.zhang@nokia.com>
Acked-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/include/asm/checksum.h b/arch/powerpc/include/asm/checksum.h
index 4e63787dc3be..842124b199b5 100644
--- a/arch/powerpc/include/asm/checksum.h
+++ b/arch/powerpc/include/asm/checksum.h
@@ -112,7 +112,7 @@ static inline __wsum csum_add(__wsum csum, __wsum addend)
 
 #ifdef __powerpc64__
 	res += (__force u64)addend;
-	return (__force __wsum)((u32)res + (res >> 32));
+	return (__force __wsum) from64to32(res);
 #else
 	asm("addc %0,%0,%1;"
 	    "addze %0,%0;"