diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 15:34:57 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:25 -0400 |
commit | 963a88b31ddbbe99f38502239b1a46601773d217 (patch) | |
tree | 9c07bbee7240db69d82d2152b7e47013012c739b /net/ipv4/ip_tunnel_core.c | |
parent | 8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7 (diff) | |
download | op-kernel-dev-963a88b31ddbbe99f38502239b1a46601773d217.zip op-kernel-dev-963a88b31ddbbe99f38502239b1a46601773d217.tar.gz |
tunnels: harmonize cleanup done on skb on xmit path
The goal of this patch is to harmonize cleanup done on a skbuff on xmit path.
Before this patch, behaviors were different depending of the tunnel type.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
-rw-r--r-- | net/ipv4/ip_tunnel_core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index e820458..d6c856b 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -48,16 +48,15 @@ int iptunnel_xmit(struct rtable *rt, 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 err; - nf_reset(skb); - secpath_reset(skb); + skb_scrub_packet(skb, xnet); + skb->rxhash = 0; - skb_dst_drop(skb); skb_dst_set(skb, &rt->dst); memset(IPCB(skb), 0, sizeof(*IPCB(skb))); |