From 0113b03851c47f9b942715b67bf98040782082d5 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 3 May 2005 16:21:37 -0700
Subject: [PATCH] --- yaml --- r: 841 b: refs/heads/master c:
 bd96535b81ad09d7593cc75093534acb984d3dc9 h: refs/heads/master i:   839:
 0b172cde0b8562b3a1bf87be2fecbe8a9d068a45 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/netfilter.c | 2 --
 trunk/net/ipv4/ip_output.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 71ea9205c5c5..a873d3951332 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4f8ab00cf3599ecb8110c0a838cd15d013b79e5
+refs/heads/master: bd96535b81ad09d7593cc75093534acb984d3dc9
diff --git a/trunk/net/core/netfilter.c b/trunk/net/core/netfilter.c
index 92c51824797d..22a8f127c4aa 100644
--- a/trunk/net/core/netfilter.c
+++ b/trunk/net/core/netfilter.c
@@ -236,8 +236,6 @@ void nf_debug_ip_loopback_xmit(struct sk_buff *newskb)
 		debug_print_hooks_ip(newskb->nf_debug);
 		nf_dump_skb(PF_INET, newskb);
 	}
-	/* Clear to avoid confusing input check */
-	newskb->nf_debug = 0;
 }
 
 void nf_debug_ip_finish_output2(struct sk_buff *skb)
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 38f69532a029..24fe3e00b42b 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -111,6 +111,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
 #ifdef CONFIG_NETFILTER_DEBUG
 	nf_debug_ip_loopback_xmit(newskb);
 #endif
+	nf_reset(newskb);
 	netif_rx(newskb);
 	return 0;
 }