Commit 6e41c585 authored by Al Viro's avatar Al Viro
Browse files

unify generic instances of csum_partial_copy_nocheck() 



quite a few architectures have the same csum_partial_copy_nocheck() -
simply memcpy() the data and then return the csum of the copy.

hexagon, parisc, ia64, s390, um: explicitly spelled out that way.

arc, arm64, csky, h8300, m68k/nommu, microblaze, mips/GENERIC_CSUM, nds32,
nios2, openrisc, riscv, unicore32: end up picking the same thing spelled
out in lib/checksum.h (with varying amounts of perversions along the way).

everybody else (alpha, arm, c6x, m68k/mmu, mips/!GENERIC_CSUM, powerpc,
sh, sparc, x86, xtensa) have non-generic variants.  For all except c6x
the declaration is in their asm/checksum.h.  c6x uses the wrapper
from asm-generic/checksum.h that would normally lead to the lib/checksum.h
instance, but in case of c6x we end up using an asm function from arch/c6x
instead.

Screw that mess - have architectures with private instances define
_HAVE_ARCH_CSUM_AND_COPY in their asm/checksum.h and have the default
one right in net/checksum.h conditional on _HAVE_ARCH_CSUM_AND_COPY
*not* defined.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3ea7ca80

arch/alpha/include/asm/checksum.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum); 
 * better 64-bit) boundary

 */

#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER

#define _HAVE_ARCH_CSUM_AND_COPY

__wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *errp);



__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);

arch/arm/include/asm/checksum.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ __wsum 
csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);



#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER

#define _HAVE_ARCH_CSUM_AND_COPY

static inline

__wsum csum_and_copy_from_user (const void __user *src, void *dst,

				      int len, __wsum sum, int *err_ptr)

arch/c6x/include/asm/checksum.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, 
}

#define csum_tcpudp_nofold csum_tcpudp_nofold



#define _HAVE_ARCH_CSUM_AND_COPY

extern __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);



#include <asm-generic/checksum.h>



#endif /* _ASM_C6X_CHECKSUM_H */

arch/hexagon/include/asm/checksum.h

+0 −11
Original line number Diff line number Diff line
@@ -9,17 +9,6 @@ 
#define do_csum	do_csum

unsigned int do_csum(const void *voidptr, int len);



/*

 * the same as csum_partial, but copies from src while it

 * checksums

 *

 * here even more important to align src and dst on a 32-bit (or even

 * better 64-bit) boundary

 */

#define csum_partial_copy_nocheck csum_partial_copy_nocheck

__wsum csum_partial_copy_nocheck(const void *src, void *dst,

					int len, __wsum sum);



/*

 * computes the checksum of the TCP/UDP pseudo-header

 * returns a 16-bit checksum, already complemented

arch/hexagon/lib/checksum.c

+0 −11
Original line number Diff line number Diff line
@@ -176,14 +176,3 @@ unsigned int do_csum(const void *voidptr, int len) 


	return 0xFFFF & sum0;

}
 


/*

 * copy from ds while checksumming, otherwise like csum_partial

 */

__wsum

csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)

{

	memcpy(dst, src, len);

	return csum_partial(dst, len, sum);

}

EXPORT_SYMBOL(csum_partial_copy_nocheck);