diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 17:34:57 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 08:27:25 +0400 |
| commit | 963a88b31ddbbe99f38502239b1a46601773d217 (patch) | |
| tree | 9c07bbee7240db69d82d2152b7e47013012c739b /net/ipv6/ip6_tunnel.c | |
| parent | 8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7 (diff) | |
| download | linux-963a88b31ddbbe99f38502239b1a46601773d217.tar.xz | |
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/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 72372ac90159..ecbcdbd4bc4f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1001,8 +1001,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, goto tx_err_dst_release; } - if (!net_eq(t->net, dev_net(dev))) - skb_scrub_packet(skb, true); + skb_scrub_packet(skb, !net_eq(t->net, dev_net(dev))); /* * Okay, now see if we can stuff it in the buffer as-is. @@ -1021,7 +1020,6 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, consume_skb(skb); skb = new_skb; } - skb_dst_drop(skb); if (fl6->flowi6_mark) { skb_dst_set(skb, dst); ndst = NULL; |