dpif-netlink: add GENEVE creation support

[cascardo/ovs.git] / datapath / compat.h

diff --git a/datapath/compat.h b/datapath/compat.h
index a30003f..816f754 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -22,34 +22,56 @@
 #include <linux/in.h>
 #include <linux/in_route.h>
 #include <linux/netlink.h>
+#include <net/ip.h>
 #include <net/route.h>
 #include <net/xfrm.h>
+#include <net/netfilter/ipv6/nf_defrag_ipv6.h>
 
+/* Even though vanilla 3.10 kernel has grp->id, RHEL 7 kernel is missing
+ * this field. */
 #ifdef HAVE_GENL_MULTICAST_GROUP_WITH_ID
 #define GROUP_ID(grp)  ((grp)->id)
 #else
 #define GROUP_ID(grp)  0
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-#define rt_dst(rt) (rt->dst)
+#ifdef HAVE_NF_IPV6_OPS_FRAGMENT
+static inline int __init ip6_output_init(void) { return 0; }
+static inline void ip6_output_exit(void) { }
 #else
-#define rt_dst(rt) (rt->u.dst)
+int __init ip6_output_init(void);
+void ip6_output_exit(void);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-#define inet_sport(sk) (inet_sk(sk)->sport)
-#else
-#define inet_sport(sk) (inet_sk(sk)->inet_sport)
-#endif
+static inline int __init compat_init(void)
+{
+       int err;
+
+       err = ipfrag_init();
+       if (err)
+               return err;
+
+       err = nf_ct_frag6_init();
+       if (err)
+               goto error_ipfrag_exit;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-static inline bool skb_encapsulation(struct sk_buff *skb)
+       err = ip6_output_init();
+       if (err)
+               goto error_frag6_exit;
+
+       return 0;
+
+error_frag6_exit:
+       nf_ct_frag6_cleanup();
+error_ipfrag_exit:
+       rpl_ipfrag_fini();
+       return err;
+}
+static inline void compat_exit(void)
 {
-       return skb->encapsulation;
+       ip6_output_exit();
+       nf_ct_frag6_cleanup();
+       rpl_ipfrag_fini();
 }
-#else
-#define skb_encapsulation(skb) false
-#endif
 
 #endif /* compat.h */