aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/checksum.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/checksum.c b/lib/checksum.c
index fcf38943132c..8b39e86dbab5 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -47,15 +47,6 @@ static inline unsigned short from32to16(unsigned int x)
47 return x; 47 return x;
48} 48}
49 49
50static inline u32 from64to32(u64 x)
51{
52 /* add up 32-bit and 32-bit for 32+c bit */
53 x = (x & 0xffffffff) + (x >> 32);
54 /* add up carry.. */
55 x = (x & 0xffffffff) + (x >> 32);
56 return (u32)x;
57}
58
59static unsigned int do_csum(const unsigned char *buff, int len) 50static unsigned int do_csum(const unsigned char *buff, int len)
60{ 51{
61 int odd; 52 int odd;
@@ -190,6 +181,15 @@ csum_partial_copy(const void *src, void *dst, int len, __wsum sum)
190EXPORT_SYMBOL(csum_partial_copy); 181EXPORT_SYMBOL(csum_partial_copy);
191 182
192#ifndef csum_tcpudp_nofold 183#ifndef csum_tcpudp_nofold
184static inline u32 from64to32(u64 x)
185{
186 /* add up 32-bit and 32-bit for 32+c bit */
187 x = (x & 0xffffffff) + (x >> 32);
188 /* add up carry.. */
189 x = (x & 0xffffffff) + (x >> 32);
190 return (u32)x;
191}
192
193__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 193__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
194 unsigned short len, 194 unsigned short len,
195 unsigned short proto, 195 unsigned short proto,