[PATCH] asm-generic: over-ride csum_partial_copy_nocheck, etc.

[PATCH] asm-generic: over-ride csum_partial_copy_nocheck, etc.

[Linas Vepstas (Code Aurora)]

There are plausbile reasons for architectures to provide their own
versions of csum_partial_copy_nocheck and csum_tcpudp_magic. 
By protecting these, the architecture can still re-use the 
asm-generic checksum.h, instead of copying it.

Signed-off-by: Linas Vepstas <linas@codeaurora.org>

---
 include/asm-generic/checksum.h |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-hexagon-kernel/include/asm-generic/checksum.h
===================================================================
--- linux-hexagon-kernel.orig/include/asm-generic/checksum.h	2011-08-31 15:31:33.000000000 -0500
+++ linux-hexagon-kernel/include/asm-generic/checksum.h	2011-08-31 15:43:35.000000000 -0500
@@ -33,8 +33,10 @@ extern __wsum csum_partial_copy(const vo
 extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
 					int len, __wsum sum, int *csum_err);
 
+#ifndef csum_partial_copy_nocheck
 #define csum_partial_copy_nocheck(src, dst, len, sum)	\
 	csum_partial_copy((src), (dst), (len), (sum))
+#endif
 
 /*
  * This is a version of ip_compute_csum() optimized for IP headers,
@@ -63,12 +65,14 @@ csum_tcpudp_nofold(__be32 saddr, __be32 
 		unsigned short proto, __wsum sum);
 #endif
 
+#ifndef csum_tcpudp_magic
 static inline __sum16
 csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
 		  unsigned short proto, __wsum sum)
 {
 	return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
+#endif
 
 /*
  * this routine is used for miscellaneous IP-like checksums, mainly
-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] asm-generic: over-ride csum_partial_copy_nocheck, etc.

[Arnd Bergmann]

On Wednesday 31 August 2011 17:35:19 Linas Vepstas wrote:
> There are plausbile reasons for architectures to provide their own
> versions of csum_partial_copy_nocheck and csum_tcpudp_magic. 
> By protecting these, the architecture can still re-use the 
> asm-generic checksum.h, instead of copying it.
> 
> Signed-off-by: Linas Vepstas <linas@codeaurora.org>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Please add the patch to your hexagon patch set.

	Arnd