From: Luc Van Oostenryck Date: Thu, 29 Jun 2017 14:31:40 +0000 (+0200) Subject: arm64: add missing conversion to __wsum in ip_fast_csum() X-Git-Tag: v4.13-rc1~147^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50a4b05609929003ce98987bb901ee10fe21fb20;p=thirdparty%2Fkernel%2Flinux.git arm64: add missing conversion to __wsum in ip_fast_csum() ARM64 implementation of ip_fast_csum() do most of the work in 128 or 64 bit and call csum_fold() to finalize. csum_fold() itself take a __wsum argument, to insure that this value is always a 32bit native-order value. Fix this by adding the sadly needed '__force' to cast the native 'sum' to the type '__wsum'. Signed-off-by: Luc Van Oostenryck Signed-off-by: Will Deacon --- diff --git a/arch/arm64/include/asm/checksum.h b/arch/arm64/include/asm/checksum.h index 09f65339d66df..0b6f5a7d4027c 100644 --- a/arch/arm64/include/asm/checksum.h +++ b/arch/arm64/include/asm/checksum.h @@ -42,7 +42,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) } while (--ihl); sum += ((sum >> 32) | (sum << 32)); - return csum_fold(sum >> 32); + return csum_fold((__force u32)(sum >> 32)); } #define ip_fast_csum ip_fast_csum