From: Tom Herbert <therbert@google.com>
Date: Fri, 2 May 2014 23:28:03 +0000 (-0700)
Subject: net: Allow csum_add to be provided in arch
X-Git-Tag: android-x86-4.4-r2~1003^2~278^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07064c6e022ba8dc0c86ce12f7851a1de24e04fc;p=android-x86%2Fkernel.git

net: Allow csum_add to be provided in arch

csum_add is really nothing more then add-with-carry which
can be implemented efficiently in some architectures.
Allow architecture to define this protected by HAVE_ARCH_CSUM_ADD.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/checksum.h b/include/net/checksum.h
index a28f4e0f6251..87cb1903640d 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -57,12 +57,14 @@ static __inline__ __wsum csum_and_copy_to_user
 }
 #endif
 
+#ifndef HAVE_ARCH_CSUM_ADD
 static inline __wsum csum_add(__wsum csum, __wsum addend)
 {
 	u32 res = (__force u32)csum;
 	res += (__force u32)addend;
 	return (__force __wsum)(res + (res < (__force u32)addend));
 }
+#endif
 
 static inline __wsum csum_sub(__wsum csum, __wsum addend)
 {