datapath:compat: Fix build failure on old kernels.

[cascardo/ovs.git] / datapath / linux / compat / include / net / vxlan.h

diff --git a/datapath/linux/compat/include/net/vxlan.h b/datapath/linux/compat/include/net/vxlan.h
index 2e56a9b..5fc4dea 100644 (file)
--- a/datapath/linux/compat/include/net/vxlan.h
+++ b/datapath/linux/compat/include/net/vxlan.h
@@ -4,9 +4,10 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/udp.h>
+#include <net/gre.h>
 
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+#ifdef USE_KERNEL_TUNNEL_API
 #include_next <net/vxlan.h>
 
 static inline int rpl_vxlan_xmit_skb(struct vxlan_sock *vs,
@@ -14,7 +15,7 @@ static inline int rpl_vxlan_xmit_skb(struct vxlan_sock *vs,
                    __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
                    __be16 src_port, __be16 dst_port, __be32 vni)
 {
-       if (skb->encapsulation && skb_is_gso(skb)) {
+       if (skb_is_gso(skb) && skb_is_encapsulated(skb)) {
                kfree_skb(skb);
                return -ENOSYS;
        }
@@ -23,8 +24,14 @@ static inline int rpl_vxlan_xmit_skb(struct vxlan_sock *vs,
        return vxlan_xmit_skb(vs, rt, skb, src, dst, tos, ttl, df,
                              src_port, dst_port, vni, false);
 #else
+#ifndef HAVE_IPTUNNEL_XMIT_NET
        return vxlan_xmit_skb(vs, rt, skb, src, dst, tos, ttl, df,
                              src_port, dst_port, vni);
+#else
+       return vxlan_xmit_skb(NULL, vs, rt, skb, src, dst, tos, ttl, df,
+                             src_port, dst_port, vni);
+#endif
+
 #endif
 }