summaryrefslogtreecommitdiffstats
path: root/include/net/ip6_tunnel.h
diff options
context:
space:
mode:
authorNicolas Dichtel2013-09-02 15:34:57 +0200
committerDavid S. Miller2013-09-04 06:27:25 +0200
commit963a88b31ddbbe99f38502239b1a46601773d217 (patch)
tree9c07bbee7240db69d82d2152b7e47013012c739b /include/net/ip6_tunnel.h
parentskb: allow skb_scrub_packet() to be used by tunnels (diff)
downloadkernel-qcow2-linux-963a88b31ddbbe99f38502239b1a46601773d217.tar.gz
kernel-qcow2-linux-963a88b31ddbbe99f38502239b1a46601773d217.tar.xz
kernel-qcow2-linux-963a88b31ddbbe99f38502239b1a46601773d217.zip
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.h1
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)
struct net_device_stats *stats = &dev->stats;
int pkt_len, err;
- nf_reset(skb);
pkt_len = skb->len;
err = ip6_local_out(skb);