X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Flinux%2Fcompat%2Finclude%2Fnet%2Fipv6.h;h=d1e32485a0bf8686594689b816105631a27cd6dc;hb=dabd3fe3f8c0161aab5dc8e2cefb6375e810a38b;hp=09115a49eb9f84ee46ca71a2210e1c6560f1e05f;hpb=7827e96773426263e60d09a2dcf9dd75e6f25567;p=openvswitch

diff --git a/datapath/linux/compat/include/net/ipv6.h b/datapath/linux/compat/include/net/ipv6.h
index 09115a49..d1e32485 100644
--- a/datapath/linux/compat/include/net/ipv6.h
+++ b/datapath/linux/compat/include/net/ipv6.h
@@ -1,21 +1,22 @@
 #ifndef __NET_IPV6_WRAPPER_H
 #define __NET_IPV6_WRAPPER_H 1
 
+#include <linux/version.h>
+
 #include_next <net/ipv6.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+#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
+
 enum {
 	OVS_IP6T_FH_F_FRAG	= (1 << 0),
 	OVS_IP6T_FH_F_AUTH	= (1 << 1),
 	OVS_IP6T_FH_F_SKIP_RH	= (1 << 2),
 };
 
-/* 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);
-
 /* This function is upstream, but not the version which skips routing
  * headers with 0 segments_left. We plan to propose the extended version. */
 #define ipv6_find_hdr rpl_ipv6_find_hdr