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

Commit 9ce35779 authored by karl beldan's avatar karl beldan Committed by David S. Miller
Browse files

lib/checksum.c: fix build for generic csum_tcpudp_nofold 



Fixed commit added from64to32 under _#ifndef do_csum_ but used it
under _#ifndef csum_tcpudp_nofold_, breaking some builds (Fengguang's
robot reported TILEGX's). Move from64to32 under the latter.

Fixes: 150ae0e9 ("lib/checksum.c: fix carry in csum_tcpudp_nofold")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarKarl Beldan <karl.beldan@rivierawaves.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 811230cd

lib/checksum.c

+9 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ static inline unsigned short from32to16(unsigned int x) 
	return x;

}



static inline u32 from64to32(u64 x)

{

	/* add up 32-bit and 32-bit for 32+c bit */

	x = (x & 0xffffffff) + (x >> 32);

	/* add up carry.. */

	x = (x & 0xffffffff) + (x >> 32);

	return (u32)x;

}



static unsigned int do_csum(const unsigned char *buff, int len)

{

	int odd;
@@ -190,6 +181,15 @@ csum_partial_copy(const void *src, void *dst, int len, __wsum sum) 
EXPORT_SYMBOL(csum_partial_copy);



#ifndef csum_tcpudp_nofold

static inline u32 from64to32(u64 x)

{

	/* add up 32-bit and 32-bit for 32+c bit */

	x = (x & 0xffffffff) + (x >> 32);

	/* add up carry.. */

	x = (x & 0xffffffff) + (x >> 32);

	return (u32)x;

}



__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,

			unsigned short len,

			unsigned short proto,