datapath: remove rpl_ipv6_skip_exthdr

[cascardo/ovs.git] / datapath / linux / compat / include / net / ipv6.h

diff --git a/datapath/linux/compat/include/net/ipv6.h b/datapath/linux/compat/include/net/ipv6.h
index 8bb7d65..48a307a 100644 (file)
--- a/datapath/linux/compat/include/net/ipv6.h
+++ b/datapath/linux/compat/include/net/ipv6.h
@@ -1,13 +1,74 @@
 #ifndef __NET_IPV6_WRAPPER_H
 #define __NET_IPV6_WRAPPER_H 1
 
+#include <linux/version.h>
+
 #include_next <net/ipv6.h>
 
-/* This function is upstream but not the version which supplies the
- * fragment offset.  We plan to propose the extended version.
+#ifndef NEXTHDR_SCTP
+#define NEXTHDR_SCTP    132 /* Stream Control Transport Protocol */
+#endif
+
+#ifndef HAVE_IP6_FH_F_SKIP_RH
+
+enum {
+       IP6_FH_F_FRAG           = (1 << 0),
+       IP6_FH_F_AUTH           = (1 << 1),
+       IP6_FH_F_SKIP_RH        = (1 << 2),
+};
+
+/* This function is upstream, but not the version which skips routing
+ * headers with 0 segments_left. We fixed it when we introduced
+ * IP6_FH_F_SKIP_RH.
  */
-#define ipv6_skip_exthdr rpl_ipv6_skip_exthdr
-extern int ipv6_skip_exthdr(const struct sk_buff *skb, int start,
-                               u8 *nexthdrp, __be16 *frag_offp);
+#define ipv6_find_hdr rpl_ipv6_find_hdr
+extern int rpl_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
+                            int target, unsigned short *fragoff, int *fragflg);
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+static inline u32 ipv6_addr_hash(const struct in6_addr *a)
+{
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+       const unsigned long *ul = (const unsigned long *)a;
+       unsigned long x = ul[0] ^ ul[1];
+
+       return (u32)(x ^ (x >> 32));
+#else
+       return (__force u32)(a->s6_addr32[0] ^ a->s6_addr32[1] ^
+                            a->s6_addr32[2] ^ a->s6_addr32[3]);
+#endif
+}
+#endif
+
+#ifndef HAVE___IPV6_ADDR_JHASH
+static inline u32 __ipv6_addr_jhash(const struct in6_addr *a, const u32 unused)
+{
+       return ipv6_addr_jhash(a);
+}
+#endif
+
+#define ip6_flowlabel rpl_ip6_flowlabel
+static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
+{
+       return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
+}
+
+#ifndef IPV6_TCLASS_SHIFT
+#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK)
+#define IPV6_TCLASS_SHIFT      20
+#endif
+
+#define ip6_tclass rpl_ip6_tclass
+static inline u8 ip6_tclass(__be32 flowinfo)
+{
+       return ntohl(flowinfo & IPV6_TCLASS_MASK) >> IPV6_TCLASS_SHIFT;
+}
+
+#define ip6_make_flowinfo rpl_ip6_make_flowinfo
+static inline __be32 ip6_make_flowinfo(unsigned int tclass, __be32 flowlabel)
+{
+       return htonl(tclass << IPV6_TCLASS_SHIFT) | flowlabel;
+}
 
 #endif