diff options
| author | Shile Zhang <shile.zhang@nokia.com> | 2017-02-04 17:03:40 +0800 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-04 23:07:17 +1100 |
| commit | 6ad966d7303b70165228dba1ee8da1a05c10eefe (patch) | |
| tree | 7b8d63bfd8f1da863a27198b5b73af448a0656ad /arch | |
| parent | 2a9c4f40ab2c281f95d41577ff0f7f78668feb73 (diff) | |
| download | linux-6ad966d7303b70165228dba1ee8da1a05c10eefe.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/checksum.h | 2 |
1 files changed, 1 insertions, 1 deletions
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;" |