Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d53a2aa3 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix sparse error in csum_replace4() 



make C=2 CF=-D__CHECK_ENDIAN__ net/ipv4/netfilter/nf_nat_l3proto_ipv4.o
  CHECK   net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
include/net/checksum.h:125:64: warning: incorrect type in argument 2 (different base types)
include/net/checksum.h:125:64:    expected restricted __wsum [usertype] addend
include/net/checksum.h:125:64:    got restricted __be32 [usertype] from
include/net/checksum.h:125:71: warning: incorrect type in argument 2 (different base types)
include/net/checksum.h:125:71:    expected restricted __wsum [usertype] addend
include/net/checksum.h:125:71:    got restricted __be32 [usertype] to
include/net/checksum.h:125:64: warning: incorrect type in argument 2 (different base types)
include/net/checksum.h:125:64:    expected restricted __wsum [usertype] addend
include/net/checksum.h:125:64:    got restricted __be32 [usertype] from
include/net/checksum.h:125:71: warning: incorrect type in argument 2 (different base types)
include/net/checksum.h:125:71:    expected restricted __wsum [usertype] addend
include/net/checksum.h:125:71:    got restricted __be32 [usertype] to

Fixes: 4565af0d ("net: optimise csum_replace4()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e2186e0

include/net/checksum.h

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ static inline __wsum csum_partial_ext(const void *buff, int len, __wsum sum) 


static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)

{

	*sum = csum_fold(csum_add(csum_sub(~csum_unfold(*sum), from), to));

	__wsum tmp = csum_sub(~csum_unfold(*sum), (__force __wsum)from);



	*sum = csum_fold(csum_add(tmp, (__force __wsum)to));

}



/* Implements RFC 1624 (Incremental Internet Checksum)