diff --git a/[refs] b/[refs]
index cfe37c8222ad..6f5a6d14da27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c44ba9f6684946b156335da6a6d55f0b8cf7cb72
+refs/heads/master: 20c1f641bb80fb272dec959a5caabed92e5a422e
diff --git a/trunk/lib/checksum.c b/trunk/lib/checksum.c
index 886b48db4f28..b08c2d059024 100644
--- a/trunk/lib/checksum.c
+++ b/trunk/lib/checksum.c
@@ -37,6 +37,7 @@
 
 #include <asm/byteorder.h>
 
+#ifndef do_csum
 static inline unsigned short from32to16(unsigned int x)
 {
 	/* add up 16-bit and 16-bit for 16+c bit */
@@ -102,6 +103,7 @@ static unsigned int do_csum(const unsigned char *buff, int len)
 out:
 	return result;
 }
+#endif
 
 /*
  *	This is a version of ip_compute_csum() optimized for IP headers,