From: Heiko Carstens <hca@linux.ibm.com>
Date: Tue, 11 Aug 2020 14:37:33 +0000 (+0200)
Subject: s390/checksum: have consistent calculations
X-Git-Tag: v5.15~2652^2~81
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=612ad0785dd5161dc311b10bd26038553a378386;p=platform%2Fkernel%2Flinux-starfive.git

s390/checksum: have consistent calculations

Use "|" instead of "+" within csum_fold() for consistency reasons,
like in the rest of the file.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h
index 8bc6bed..de97ae6 100644
--- a/arch/s390/include/asm/checksum.h
+++ b/arch/s390/include/asm/checksum.h
@@ -54,7 +54,7 @@ static inline __sum16 csum_fold(__wsum sum)
 {
 	u32 csum = (__force u32) sum;
 
-	csum += (csum >> 16) + (csum << 16);
+	csum += (csum >> 16) | (csum << 16);
 	csum >>= 16;
 	return (__force __sum16) ~csum;
 }