From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Kuo Subject: [patch v3 36/36] Add extra arch overrides to asm-generic/checksum.h Date: Thu, 08 Sep 2011 20:09:23 -0500 Message-ID: <20110909010918.150375980@codeaurora.org> References: <20110909010847.294039464@codeaurora.org> Return-path: Content-Disposition: inline; filename=generic-checksum.diff Sender: linux-hexagon-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arch@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linas Vepstas , Arnd Bergmann There are plausible 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 Acked-by: Arnd Bergmann --- 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-09-03 20:14:46.214943511 -0500 +++ linux-hexagon-kernel/include/asm-generic/checksum.h 2011-09-03 20:14:59.874981811 -0500 @@ -33,8 +33,10 @@ 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 @@ 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.