netdev: Improve comments on netdev_rxq_recv().

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

diff --git a/datapath/compat.h b/datapath/compat.h
index a6404c6..0e19051 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -25,6 +25,7 @@
 #include <net/ip.h>
 #include <net/route.h>
 #include <net/xfrm.h>
+#include <net/netfilter/ipv6/nf_defrag_ipv6.h>
 
 #ifdef HAVE_GENL_MULTICAST_GROUP_WITH_ID
 #define GROUP_ID(grp)  ((grp)->id)
@@ -54,12 +55,42 @@ static inline bool skb_encapsulation(struct sk_buff *skb)
 #endif
 
 #ifdef OVS_FRAGMENT_BACKPORT
+#ifdef HAVE_NF_IPV6_OPS_FRAGMENT
+static inline int __init ip6_output_init(void) { return 0; }
+static inline void ip6_output_exit(void) { }
+#else
+int __init ip6_output_init(void);
+void ip6_output_exit(void);
+#endif
+
 static inline int __init compat_init(void)
 {
-       return ipfrag_init();
+       int err;
+
+       err = ipfrag_init();
+       if (err)
+               return err;
+
+       err = nf_ct_frag6_init();
+       if (err)
+               goto error_ipfrag_exit;
+
+       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)
 {
+       ip6_output_exit();
+       nf_ct_frag6_cleanup();
        rpl_ipfrag_fini();
 }
 #else