git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
datapath: Add support for Linux 3.12
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
gre.c
diff --git
a/datapath/linux/compat/gre.c
b/datapath/linux/compat/gre.c
index
58b1e73
..
07b270a
100644
(file)
--- a/
datapath/linux/compat/gre.c
+++ b/
datapath/linux/compat/gre.c
@@
-16,6
+16,9
@@
* 02110-1301, USA
*/
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)
+
#include <linux/kconfig.h>
#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
@@
-340,3
+343,5
@@
void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
}
#endif /* CONFIG_NET_IPGRE_DEMUX */
+
+#endif /* 3.12 */