---

yaml
---
r: 360123
b: refs/heads/master
c: 64e6907
h: refs/heads/master
i:
  360121: d870578
  360119: 9170256
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5eae458e923af9968679fd75fd1f7670200bc3
+refs/heads/master: 64e69073c35439fa19c2ad2a4a18834e0314f071

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
 /*

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,