* [PATCH] lib/checksum.c: fix build for generic csum_tcpudp_nofold
@ 2015-01-29 10:10 Karl Beldan
2015-01-29 19:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Karl Beldan @ 2015-01-29 10:10 UTC (permalink / raw)
To: David S . Miller
Cc: Karl Beldan, Karl Beldan, netdev, linux-kernel, Eric Dumazet
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: 150ae0e94634 ("lib/checksum.c: fix carry in csum_tcpudp_nofold")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
---
lib/checksum.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/checksum.c b/lib/checksum.c
index fcf3894..8b39e86 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -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,
--
2.0.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] lib/checksum.c: fix build for generic csum_tcpudp_nofold
2015-01-29 10:10 [PATCH] lib/checksum.c: fix build for generic csum_tcpudp_nofold Karl Beldan
@ 2015-01-29 19:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-01-29 19:58 UTC (permalink / raw)
To: karl.beldan; +Cc: karl.beldan, netdev, linux-kernel, edumazet
From: Karl Beldan <karl.beldan@gmail.com>
Date: Thu, 29 Jan 2015 11:10:22 +0100
> 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: 150ae0e94634 ("lib/checksum.c: fix carry in csum_tcpudp_nofold")
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-29 19:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-29 10:10 [PATCH] lib/checksum.c: fix build for generic csum_tcpudp_nofold Karl Beldan
2015-01-29 19:58 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.