diff mbox series

[mips-next,3/3] MIPS: checksum: fix sparse flooding on asm/checksum.h

Message ID WDTCGAs6T_1WrYWzhajhKbTIXfzTBLg0bGDdJpUkGxVMdTG4pu3AzSorhGtletaoPhEf43qQ_F6kO0dndfIfhZsc2MGwcU9indtM80T4cI0=@pm.me (mailing list archive)
State Mainlined
Commit ff711d67b1786ec1e3e4019d615287a2e890e9ab
Headers show
Series MIPS: fix the two most annoying sparse floods | expand

Commit Message

Alexander Lobakin June 20, 2020, 9:35 a.m. UTC
csum_fold() in MIPS' asm/checksum.h is another source of sparse flooding
when building different networking source code.
The thing is that only half of __wsum <--> u32 casts inside the funtion
is forced, which is insufficient.
Add all necessary forced typecasting to stop floods and simplify actual
bug hunting.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 arch/mips/include/asm/checksum.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index dcebaaf8c862..181f7d14efb9 100644
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -113,9 +113,9 @@  static inline __sum16 csum_fold(__wsum csum)
 	u32 sum = (__force u32)csum;
 
 	sum += (sum << 16);
-	csum = (sum < csum);
+	csum = (__force __wsum)(sum < (__force u32)csum);
 	sum >>= 16;
-	sum += csum;
+	sum += (__force u32)csum;
 
 	return (__force __sum16)~sum;
 }