diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-09 10:22:56 +0100 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-09 10:22:56 +0100 |
commit | 3b7fbaed52361fbb5628e3aa602d9a26f06032b6 (patch) | |
tree | 333716c9f4ac8afe289a54e4f7a3adfa13c1c095 /lib | |
parent | 4db90771e1e9375c40be148052ce0a76901b31d5 (diff) | |
parent | 413cb08cebe9fd8107f556eee48b2d40773cacde (diff) |
Merge tag 'v3.14.34' into v3.14-rt
This is the 3.14.34 stable release
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/checksum.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/checksum.c b/lib/checksum.c index 129775eb6de6..8b39e86dbab5 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -181,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, @@ -195,8 +204,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, #else s += (proto + len) << 8; #endif - s += (s >> 32); - return (__force __wsum)s; + return (__force __wsum)from64to32(s); } EXPORT_SYMBOL(csum_tcpudp_nofold); #endif |