lib: Fix netbsd compilation error.

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

diff --git a/datapath/compat.h b/datapath/compat.h
index 71fa06c..0e19051 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2015 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -19,66 +19,83 @@
 #ifndef COMPAT_H
 #define COMPAT_H 1
 
+#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>
 
-#ifndef HAVE_NLA_NUL_STRING
-static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
-{
-       char *s;
-       int len;
-       if (!attr)
-               return 0;
+#ifdef HAVE_GENL_MULTICAST_GROUP_WITH_ID
+#define GROUP_ID(grp)  ((grp)->id)
+#else
+#define GROUP_ID(grp)  0
+#endif
 
-       len = nla_len(attr);
-       if (len >= maxlen)
-               return -EINVAL;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#define rt_dst(rt) (rt->dst)
+#else
+#define rt_dst(rt) (rt->u.dst)
+#endif
 
-       s = nla_data(attr);
-       if (s[len - 1] != '\0')
-               return -EINVAL;
+#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
 
-       return 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+static inline bool skb_encapsulation(struct sk_buff *skb)
+{
+       return skb->encapsulation;
 }
 #else
-static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
+#define skb_encapsulation(skb) false
+#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)
 {
+       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;
-}
-#endif  /* !HAVE_NLA_NUL_STRING */
 
-static inline void skb_clear_rxhash(struct sk_buff *skb)
+error_frag6_exit:
+       nf_ct_frag6_cleanup();
+error_ipfrag_exit:
+       rpl_ipfrag_fini();
+       return err;
+}
+static inline void compat_exit(void)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
-       skb->rxhash = 0;
-#endif
+       ip6_output_exit();
+       nf_ct_frag6_cleanup();
+       rpl_ipfrag_fini();
 }
-
-/*
- * Enforces, mutual exclusion with the Linux bridge module, by declaring and
- * exporting br_should_route_hook.  Because the bridge module also exports the
- * same symbol, the module loader will refuse to load both modules at the same
- * time (e.g. "bridge: exports duplicate symbol br_should_route_hook (owned by
- * openvswitch)").
- *
- * Before Linux 2.6.36, Open vSwitch cannot safely coexist with the Linux
- * bridge module, so openvswitch uses this macro in those versions.  In
- * Linux 2.6.36 and later, Open vSwitch can coexist with the bridge module,
- * but it makes no sense to load both bridge and brcompat, so brcompat uses
- * this macro in those versions.
- *
- * The use of "typeof" here avoids the need to track changes in the type of
- * br_should_route_hook over various kernel versions.
- */
-#define BRIDGE_MUTUAL_EXCLUSION                                        \
-       typeof(br_should_route_hook) br_should_route_hook;      \
-       EXPORT_SYMBOL(br_should_route_hook)
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
-#define GENL_SOCK(net) (genl_sock)
-#define SET_NETNSOK
 #else
-#define GENL_SOCK(net) ((net)->genl_sock)
-#define SET_NETNSOK    .netnsok = true,
+static inline int __init compat_init(void) { return 0; }
+static inline void compat_exit(void) { }
 #endif
 
 #endif /* compat.h */