From 590867c153a9e17fc5599bb152d0ff7df2693003 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Fri, 18 Jan 2013 15:12:16 +0530 Subject: [PATCH] --- yaml --- r: 360123 b: refs/heads/master c: 64e69073c35439fa19c2ad2a4a18834e0314f071 h: refs/heads/master i: 360121: d8705787f139eb5d283f12490f45a38e436b80a0 360119: 9170256e660c404488448488c0e27acb173a1079 v: v3 --- [refs] | 2 +- trunk/include/asm-generic/checksum.h | 4 ++++ trunk/lib/checksum.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7356cf583823..baf5077c7a55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a5eae458e923af9968679fd75fd1f7670200bc3 +refs/heads/master: 64e69073c35439fa19c2ad2a4a18834e0314f071 diff --git a/trunk/include/asm-generic/checksum.h b/trunk/include/asm-generic/checksum.h index c084767c88bc..59811df58c5b 100644 --- a/trunk/include/asm-generic/checksum.h +++ b/trunk/include/asm-generic/checksum.h @@ -38,12 +38,15 @@ extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst, csum_partial_copy((src), (dst), (len), (sum)) #endif +#ifndef ip_fast_csum /* * This is a version of ip_compute_csum() optimized for IP headers, * which always checksum on 4 octet boundaries. */ extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl); +#endif +#ifndef csum_fold /* * Fold a partial checksum */ @@ -54,6 +57,7 @@ static inline __sum16 csum_fold(__wsum csum) sum = (sum & 0xffff) + (sum >> 16); return (__force __sum16)~sum; } +#endif #ifndef csum_tcpudp_nofold /* diff --git a/trunk/lib/checksum.c b/trunk/lib/checksum.c index 12dceb27ff20..129775eb6de6 100644 --- a/trunk/lib/checksum.c +++ b/trunk/lib/checksum.c @@ -102,6 +102,7 @@ static unsigned int do_csum(const unsigned char *buff, int len) } #endif +#ifndef ip_fast_csum /* * This is a version of ip_compute_csum() optimized for IP headers, * which always checksum on 4 octet boundaries. @@ -111,6 +112,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) return (__force __sum16)~do_csum(iph, ihl*4); } EXPORT_SYMBOL(ip_fast_csum); +#endif /* * computes the checksum of a memory block at buff, length len,