From 599ad5460bbcd0f4e6f664b7c8c3e88fdc3d5fc2 Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Mon, 6 Nov 2006 10:06:23 -0800
Subject: [PATCH] --- yaml --- r: 41035 b: refs/heads/master c:
 53ab61c6d8f391bda04dbc1e95bac348fe81103b h: refs/heads/master i:   41033:
 7d8aa3704c26a261adf28197c9ba84fd88895552   41031:
 6044b6e008a45a29da35954fb18861292a06f941 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_tunnel.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fcb6a269622c..5d5f88fc4e82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3fdd9f115c776d381b30b296849f8e4046bcdaa
+refs/heads/master: 53ab61c6d8f391bda04dbc1e95bac348fe81103b
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index c8d4160385f6..b9f40290d12a 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -542,6 +542,7 @@ ip6ip6_rcv(struct sk_buff *skb)
 		skb->dev = t->dev;
 		dst_release(skb->dst);
 		skb->dst = NULL;
+		nf_reset(skb);
 		if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY)
 			ipv6_copy_dscp(ipv6h, skb->nh.ipv6h);
 		ip6ip6_ecn_decapsulate(ipv6h, skb);