Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 31bf97f51154cc669513b329d395bcad37b9e213

Authored by karl beldan
Committed by Greg Kroah-Hartman
1 parent 1fb326794a

lib/checksum.c: fix build for generic csum_tcpudp_nofold 

commit 9ce357795ef208faa0d59894d9d119a7434e37f3 upstream.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -47,15 +47,6 @@
47 47 return x;
48 48 }
49 49  
50   -static 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   -
59 50 static unsigned int do_csum(const unsigned char *buff, int len)
60 51 {
61 52 int odd;
... ... @@ -190,6 +181,15 @@
190 181 EXPORT_SYMBOL(csum_partial_copy);
191 182  
192 183 #ifndef csum_tcpudp_nofold
  184 +static 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 193 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
194 194 unsigned short len,
195 195 unsigned short proto,