X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux-2.6%2Fcompat-2.6%2Finclude%2Fnet%2Fchecksum.h;h=73f2f5992dbeb93713a8098324e1ff48f937eda8;hb=918097dacf8f08a52d94b85d276b031b5fb69d4d;hp=e7e7966c2dca8f2a528b20d740b3cdfedf9800ce;hpb=27b1bdef46dffa58967991682842d2cd248ad16e;p=sliver-openvswitch.git

diff --git a/datapath/linux-2.6/compat-2.6/include/net/checksum.h b/datapath/linux-2.6/compat-2.6/include/net/checksum.h
index e7e7966c2..73f2f5992 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/checksum.h
+++ b/datapath/linux-2.6/compat-2.6/include/net/checksum.h
@@ -18,14 +18,16 @@ static inline __wsum csum_unfold(__sum16 n)
 	csum_and_copy_to_user(src, dst, len, sum, NULL, err_ptr)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#ifndef HAVE_CSUM_REPLACE4
 static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)
 {
 	__be32 diff[] = { ~from, to };
 
 	*sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
 }
+#endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 #define inet_proto_csum_replace2(sum, skb, from, to, pseudohdr) \
 	inet_proto_csum_replace4(sum, skb, (__force __be32)(from), \
 					   (__force __be32)(to), pseudohdr)