Skip to contentSkip to conversation

asm-generic: over-ride csum_partial_copy_nocheck, etc.

PATCH In review Linas Vepstas (Code Aurora) 2 participants 2 messages Aug 31, 2011 – Sep 1, 2011 Generic include/asm header files

lore
Share & tools
lore

Linas Vepstas (Code Aurora)

author
#0 lore raw

PATCH 1/1 asm-generic: over-ride csum_partial_copy_nocheck, etc.

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 <[email protected]>
---
 include/asm-generic/checksum.h |    4 ++++
 1 file changed, 4 insertions(+)
include/asm-generic/checksum.h +4 -0
Index: linux-hexagon-kernel/include/asm-generic/checksum.h
===================================================================
@@ -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
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · 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 <[email protected]>
Acked-by Arnd Bergmann <[email protected]>

Please add the patch to your hexagon patch set.

Arnd