X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fnet%2Fip6_tunnel.h;h=6d1549c4893cbec83ab2aec280b08c650dff0cfd;hb=963a88b31ddbbe99f38502239b1a46601773d217;hp=4da5de10d1d49f62bbbe33e770e4c95f2b5c9ddd;hpb=297b8a07347555f0d2fafa4a1ddfc332d2d4afa9;p=~andy%2Flinux

diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 4da5de10d1d..6d1549c4893 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -36,6 +36,7 @@ struct __ip6_tnl_parm {
 struct ip6_tnl {
 	struct ip6_tnl __rcu *next;	/* next tunnel in list */
 	struct net_device *dev;	/* virtual device associated with tunnel */
+	struct net *net;	/* netns for packet i/o */
 	struct __ip6_tnl_parm parms;	/* tunnel configuration parameters */
 	struct flowi fl;	/* flowi template for xmit */
 	struct dst_entry *dst_cache;    /* cached dst */
@@ -74,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);