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 kernel 3.14.
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
ip_tunnels_core.c
diff --git
a/datapath/linux/compat/ip_tunnels_core.c
b/datapath/linux/compat/ip_tunnels_core.c
index
01cc2fb
..
d650be2
100644
(file)
--- a/
datapath/linux/compat/ip_tunnels_core.c
+++ b/
datapath/linux/compat/ip_tunnels_core.c
@@
-16,6
+16,9
@@
* 02110-1301, USA
*/
* 02110-1301, USA
*/
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)
+
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/in.h>
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/in.h>
@@
-31,14
+34,13
@@
#include <net/route.h>
#include <net/xfrm.h>
#include <net/route.h>
#include <net/xfrm.h>
-#include "checksum.h"
#include "compat.h"
#include "gso.h"
#include "compat.h"
#include "gso.h"
-int iptunnel_xmit(struct
net *net, struct
rtable *rt,
+int iptunnel_xmit(struct rtable *rt,
struct sk_buff *skb,
__be32 src, __be32 dst, __u8 proto,
struct sk_buff *skb,
__be32 src, __be32 dst, __u8 proto,
- __u8 tos, __u8 ttl, __be16 df)
+ __u8 tos, __u8 ttl, __be16 df
, bool xnet
)
{
int pkt_len = skb->len;
struct iphdr *iph;
{
int pkt_len = skb->len;
struct iphdr *iph;
@@
-46,7
+48,7
@@
int iptunnel_xmit(struct net *net, struct rtable *rt,
nf_reset(skb);
secpath_reset(skb);
nf_reset(skb);
secpath_reset(skb);
- skb_clear_
rx
hash(skb);
+ skb_clear_hash(skb);
skb_dst_drop(skb);
skb_dst_set(skb, &rt_dst(rt));
#if 0
skb_dst_drop(skb);
skb_dst_set(skb, &rt_dst(rt));
#if 0
@@
-100,15
+102,14
@@
int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
skb->protocol = inner_proto;
}
skb->protocol = inner_proto;
}
- if (unlikely(compute_ip_summed(skb, false)))
- return -EPROTO;
-
nf_reset(skb);
secpath_reset(skb);
nf_reset(skb);
secpath_reset(skb);
- skb_clear_
rx
hash(skb);
+ skb_clear_hash(skb);
skb_dst_drop(skb);
vlan_set_tci(skb, 0);
skb_set_queue_mapping(skb, 0);
skb->pkt_type = PACKET_HOST;
return 0;
}
skb_dst_drop(skb);
vlan_set_tci(skb, 0);
skb_set_queue_mapping(skb, 0);
skb->pkt_type = PACKET_HOST;
return 0;
}
+
+#endif /* 3.12 */