gre: Restructure tunneling.

[sliver-openvswitch.git] / datapath / linux / compat / skbuff-openvswitch.c

diff --git a/datapath/linux/compat/skbuff-openvswitch.c b/datapath/linux/compat/skbuff-openvswitch.c
index ef43ba9..2707ef0 100644 (file)
--- a/datapath/linux/compat/skbuff-openvswitch.c
+++ b/datapath/linux/compat/skbuff-openvswitch.c
@@ -1,9 +1,11 @@
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+
 #if !defined(HAVE_SKB_WARN_LRO) && defined(NETIF_F_LRO)
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/netdevice.h>
-
 void __skb_warn_lro_forwarding(const struct sk_buff *skb)
 {
        if (net_ratelimit())
@@ -12,3 +14,25 @@ void __skb_warn_lro_forwarding(const struct sk_buff *skb)
 }
 
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+int skb_checksum_help(struct sk_buff *skb, int inward)
+#else
+int skb_checksum_help(struct sk_buff *skb)
+#endif
+{
+       if (unlikely(skb_is_nonlinear(skb))) {
+               int err;
+
+               err = __skb_linearize(skb);
+               if (unlikely(err))
+                       return err;
+       }
+
+#undef skb_checksum_help
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+       return skb_checksum_help(skb, 0);
+#else
+       return skb_checksum_help(skb);
+#endif
+}