projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: ipv6_skip_exthdr() is now fully upstream.
[openvswitch]
/
datapath
/
linux
/
compat
/
exthdrs_core.c
diff --git
a/datapath/linux/compat/exthdrs_core.c
b/datapath/linux/compat/exthdrs_core.c
index eb56e6b26bbb84ddf61bc8b8cd0cd2d8dcc2bd3d..e2b4a03cb6a4ad8f5e19ebe54dd49a54e2319950 100644
(file)
--- a/
datapath/linux/compat/exthdrs_core.c
+++ b/
datapath/linux/compat/exthdrs_core.c
@@
-1,9
+1,8
@@
#include <linux/ipv6.h>
#include <linux/ipv6.h>
+#include <linux/version.h>
#include <net/ipv6.h>
#include <net/ipv6.h>
-/* This function is upstream but not the version which supplies the
- * fragment offset. We plan to propose the extended version.
- */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
int rpl_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
u8 *nexthdrp, __be16 *frag_offp)
{
int rpl_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
u8 *nexthdrp, __be16 *frag_offp)
{
@@
-46,6
+45,7
@@
int rpl_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
*nexthdrp = nexthdr;
return start;
}
*nexthdrp = nexthdr;
return start;
}
+#endif /* Kernel version < 3.3 */
/*
* find the offset to specified header or the protocol number of last header
/*
* find the offset to specified header or the protocol number of last header