log errors from host command

[sliver-openvswitch.git] / datapath / compat.h

diff --git a/datapath/compat.h b/datapath/compat.h
index c7fd225..8457dbf 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -19,7 +19,12 @@
 #ifndef COMPAT_H
 #define COMPAT_H 1
 
+#include <linux/in.h>
+#include <linux/in_route.h>
 #include <linux/netlink.h>
+#include <net/route.h>
+#include <net/xfrm.h>
+
 
 #ifndef HAVE_NLA_NUL_STRING
 static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
@@ -61,6 +66,13 @@ static inline void skb_clear_rxhash(struct sk_buff *skb)
 #define SET_NETNSOK    .netnsok = true,
 #endif
 
+#ifdef HAVE_PARALLEL_OPS
+#define SET_PARALLEL_OPS       .parallel_ops = true,
+#else
+#define SET_PARALLEL_OPS
+#endif
+
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 #ifdef CONFIG_NETFILTER
 static inline u32 skb_get_mark(struct sk_buff *skb)
@@ -94,4 +106,53 @@ static inline void skb_set_mark(struct sk_buff *skb, u32 mark)
 }
 #endif /* after 2.6.20 */
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#define rt_dst(rt) (rt->dst)
+#else
+#define rt_dst(rt) (rt->u.dst)
+#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 struct rtable *find_route(struct net *net,
+                                       __be32 *saddr, __be32 daddr,
+                                       u8 ipproto, u8 tos, u32 skb_mark)
+{
+       struct rtable *rt;
+       /* Tunnel configuration keeps DSCP part of TOS bits, But Linux
+        * router expect RT_TOS bits only. */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
+       struct flowi fl = { .nl_u = { .ip4_u = {
+                                       .daddr = daddr,
+                                       .saddr = *saddr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+                                       .fwmark = skb_mark,
+#endif
+                                       .tos   = RT_TOS(tos) } },
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+                                       .mark = skb_mark,
+#endif
+                                       .proto = ipproto };
+
+       if (unlikely(ip_route_output_key(net, &rt, &fl)))
+               return ERR_PTR(-EADDRNOTAVAIL);
+       *saddr = fl.nl_u.ip4_u.saddr;
+       return rt;
+#else
+       struct flowi4 fl = { .daddr = daddr,
+                            .saddr = *saddr,
+                            .flowi4_tos = RT_TOS(tos),
+                            .flowi4_mark = skb_mark,
+                            .flowi4_proto = ipproto };
+
+       rt = ip_route_output_key(net, &fl);
+       *saddr = fl.saddr;
+       return rt;
+#endif
+}
 #endif /* compat.h */