diff options
Diffstat (limited to 'include/net/ip6_tunnel.h')
-rw-r--r-- | include/net/ip6_tunnel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index 4da5de10d1d4..6d1549c4893c 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h | |||
@@ -36,6 +36,7 @@ struct __ip6_tnl_parm { | |||
36 | struct ip6_tnl { | 36 | struct ip6_tnl { |
37 | struct ip6_tnl __rcu *next; /* next tunnel in list */ | 37 | struct ip6_tnl __rcu *next; /* next tunnel in list */ |
38 | struct net_device *dev; /* virtual device associated with tunnel */ | 38 | struct net_device *dev; /* virtual device associated with tunnel */ |
39 | struct net *net; /* netns for packet i/o */ | ||
39 | struct __ip6_tnl_parm parms; /* tunnel configuration parameters */ | 40 | struct __ip6_tnl_parm parms; /* tunnel configuration parameters */ |
40 | struct flowi fl; /* flowi template for xmit */ | 41 | struct flowi fl; /* flowi template for xmit */ |
41 | struct dst_entry *dst_cache; /* cached dst */ | 42 | struct dst_entry *dst_cache; /* cached dst */ |
@@ -74,7 +75,6 @@ static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
74 | struct net_device_stats *stats = &dev->stats; | 75 | struct net_device_stats *stats = &dev->stats; |
75 | int pkt_len, err; | 76 | int pkt_len, err; |
76 | 77 | ||
77 | nf_reset(skb); | ||
78 | pkt_len = skb->len; | 78 | pkt_len = skb->len; |
79 | err = ip6_local_out(skb); | 79 | err = ip6_local_out(skb); |
80 | 80 | ||