diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 09:34:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:25 -0400 |
commit | 963a88b31ddbbe99f38502239b1a46601773d217 (patch) | |
tree | 9c07bbee7240db69d82d2152b7e47013012c739b /include/net/ip6_tunnel.h | |
parent | 8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7 (diff) |
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 'include/net/ip6_tunnel.h')
-rw-r--r-- | include/net/ip6_tunnel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index 2265b0bf97e5..6d1549c4893c 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h | |||
@@ -75,7 +75,6 @@ static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
75 | struct net_device_stats *stats = &dev->stats; | 75 | struct net_device_stats *stats = &dev->stats; |
76 | int pkt_len, err; | 76 | int pkt_len, err; |
77 | 77 | ||
78 | nf_reset(skb); | ||
79 | pkt_len = skb->len; | 78 | pkt_len = skb->len; |
80 | err = ip6_local_out(skb); | 79 | err = ip6_local_out(skb); |
81 | 80 | ||