From 444a923fcf16cf3604b450ad0f5fb66c25098616 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Mon, 31 Oct 2011 18:56:59 -0500 Subject: [PATCH] --- yaml --- r: 272265 b: refs/heads/master c: 4e29198e1cd7728c30c96a8483a6068c71b34e4e h: refs/heads/master i: 272263: e890d01729e9b4c28f88d2a156d17c78970bcb9b v: v3 --- [refs] | 2 +- trunk/include/asm-generic/checksum.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 346a2f541226..74837d100b50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f4567cf4ff586e318aa1bc586a69570d64b162a +refs/heads/master: 4e29198e1cd7728c30c96a8483a6068c71b34e4e diff --git a/trunk/include/asm-generic/checksum.h b/trunk/include/asm-generic/checksum.h index 4647c762d970..c084767c88bc 100644 --- a/trunk/include/asm-generic/checksum.h +++ b/trunk/include/asm-generic/checksum.h @@ -33,8 +33,10 @@ extern __wsum csum_partial_copy(const void *src, void *dst, int len, __wsum sum) 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 daddr, unsigned short len, 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