Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03bc8b0f authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc32: checksum_wrappers_64 becomes checksum_wrappers 



The powerpc64 checksum wrapper functions adds csum_and_copy_to_user()
which otherwise is implemented in include/net/checksum.h by using
csum_partial() then copy_to_user()

Those two wrapper fonctions are also applicable to powerpc32 as it is
based on the use of csum_partial_copy_generic() which also
exists on powerpc32

This patch renames arch/powerpc/lib/checksum_wrappers_64.c to
arch/powerpc/lib/checksum_wrappers.c and
makes it non-conditional to CONFIG_WORD_SIZE

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 11dfbf58

arch/powerpc/include/asm/checksum.h

+0 −9
Original line number Diff line number Diff line
@@ -47,21 +47,12 @@ extern __wsum csum_partial_copy_generic(const void *src, void *dst, 
					      int len, __wsum sum,

					      int *src_err, int *dst_err);



#ifdef __powerpc64__

#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER

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

				      int len, __wsum sum, int *err_ptr);

#define HAVE_CSUM_COPY_USER

extern __wsum csum_and_copy_to_user(const void *src, void __user *dst,

				    int len, __wsum sum, int *err_ptr);

#else

/*

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

 * checksums.

 */

#define csum_partial_copy_from_user(src, dst, len, sum, errp)   \

        csum_partial_copy_generic((__force const void *)(src), (dst), (len), (sum), (errp), NULL)

#endif



#define csum_partial_copy_nocheck(src, dst, len, sum)   \

        csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)

arch/powerpc/lib/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ obj64-$(CONFIG_SMP) += locks.o 
obj64-$(CONFIG_ALTIVEC)	+= vmx-helper.o



ifeq ($(CONFIG_GENERIC_CSUM),)

obj-y			+= checksum_$(CONFIG_WORD_SIZE).o

obj-$(CONFIG_PPC64)	+= checksum_wrappers_64.o

obj-y			+= checksum_$(CONFIG_WORD_SIZE).o checksum_wrappers.o

endif



obj-$(CONFIG_PPC_EMULATE_SSTEP)	+= sstep.o ldstfp.o