Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
datapath/linux/compat/include/linux/ipv6.h | 8 --------
datapath/linux/compat/include/linux/jiffies.h | 2 ++
datapath/linux/compat/include/net/ipv6.h | 13 +++++++++++++
3 files changed, 15 insertions(+), 8 deletions(-)
create mode 100644 datapath/linux/compat/include/net/ipv6.h
diff --git a/datapath/linux/compat/include/linux/ipv6.h
b/datapath/linux/compat/include/linux/ipv6.h
index fdbbe62..25a5431 100644
--- a/datapath/linux/compat/include/linux/ipv6.h
+++ b/datapath/linux/compat/include/linux/ipv6.h
@@ -2,7 +2,6 @@
#define __LINUX_IPV6_WRAPPER_H 1
#include_next <linux/ipv6.h>
-#include <net/ipv6.h>
#ifndef HAVE_SKBUFF_HEADER_HELPERS
static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
@@ -11,11 +10,4 @@ static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff
*skb)
}
#endif
-/* This function is upstream but not the version which supplies the
- * fragment offset. We plan to propose the extended version.
- */
-#define ipv6_skip_exthdr rpl_ipv6_skip_exthdr
-extern int rpl_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
- u8 *nexthdrp, __be16 *frag_offp);
-
#endif
diff --git a/datapath/linux/compat/include/linux/jiffies.h
b/datapath/linux/compat/include/linux/jiffies.h
index a64f226..7723c1c 100644
--- a/datapath/linux/compat/include/linux/jiffies.h
+++ b/datapath/linux/compat/include/linux/jiffies.h
@@ -13,12 +13,14 @@
(typecheck(__u64, a) && \
typecheck(__u64, b) && \
((__s64)(b) - (__s64)(a) < 0))
+#undef time_before64
#define time_before64(a, b) time_after64(b, a)
#define time_after_eq64(a, b) \
(typecheck(__u64, a) && \
typecheck(__u64, b) && \
((__s64)(a) - (__s64)(b) >= 0))
+#undef time_before_eq64
#define time_before_eq64(a, b) time_after_eq64(b, a)
#endif /* linux kernel < 2.6.19 */
diff --git a/datapath/linux/compat/include/net/ipv6.h
b/datapath/linux/compat/include/net/ipv6.h
new file mode 100644
index 0000000..8bb7d65
--- /dev/null
+++ b/datapath/linux/compat/include/net/ipv6.h
@@ -0,0 +1,13 @@
+#ifndef __NET_IPV6_WRAPPER_H
+#define __NET_IPV6_WRAPPER_H 1
+
+#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.
+ */
+#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);
+
+#endif
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
