datapath: Enable OVS GSO to be used up to 3.18 if necessary.

[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 7270eb1..198a1e3 100644 (file)
--- a/datapath/linux/compat/include/net/vxlan.h
+++ b/datapath/linux/compat/include/net/vxlan.h
@@ -8,7 +8,9 @@
 
 #include <linux/version.h>
 
-#ifdef USE_KERNEL_TUNNEL_API
+#ifdef HAVE_VXLAN_METADATA
+#define USE_UPSTREAM_VXLAN
+
 #include_next <net/vxlan.h>
 #endif
 
@@ -81,9 +83,7 @@ struct vxlanhdr_gbp {
 #define VXLAN_F_RCV_FLAGS                      VXLAN_F_GBP
 #endif
 
-#ifdef HAVE_VXLAN_METADATA
-#define USE_UPSTREAM_VXLAN
-
+#ifdef USE_UPSTREAM_VXLAN
 static inline int rpl_vxlan_xmit_skb(struct vxlan_sock *vs,
                    struct rtable *rt, struct sk_buff *skb,
                    __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
@@ -100,7 +100,7 @@ static inline int rpl_vxlan_xmit_skb(struct vxlan_sock *vs,
 }
 
 #define vxlan_xmit_skb rpl_vxlan_xmit_skb
-#else /* HAVE_VXLAN_METADATA */
+#else /* USE_UPSTREAM_VXLAN */
 
 struct vxlan_metadata {
        __be32          vni;