X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux%2Fcompat%2Fnetdevice.c;h=d26fb5e2adf84662acb79aa5198eefe66e2f97ff;hb=42d5dd9595cce35a8825a20be7d71a3a8f6f5640;hp=9e92eeb8d9191537d77d66c7c1d7b8fda872c512;hpb=f285d3e715512571c4b2f92a4d1c65022bbcc9d5;p=sliver-openvswitch.git

diff --git a/datapath/linux/compat/netdevice.c b/datapath/linux/compat/netdevice.c
index 9e92eeb8d..d26fb5e2a 100644
--- a/datapath/linux/compat/netdevice.c
+++ b/datapath/linux/compat/netdevice.c
@@ -2,6 +2,7 @@
 #include <linux/if_vlan.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+#ifndef HAVE_CAN_CHECKSUM_PROTOCOL
 static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 {
 	return  ((features & NETIF_F_GEN_CSUM) ||
@@ -12,6 +13,7 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 		((features & NETIF_F_FCOE_CRC) &&
 				protocol == htons(ETH_P_FCOE)));
 }
+#endif
 
 static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
 {