From: Patrick McHardy <kaber@trash.net>
Date: Tue, 3 May 2005 23:21:37 +0000 (-0700)
Subject: [NETFILTER]: Drop conntrack reference in ip_dev_loopback_xmit()
X-Git-Tag: v2.6.12-rc4~117^2~23^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd96535b81ad09d7593cc75093534acb984d3dc9;p=linux-2.6

[NETFILTER]: Drop conntrack reference in ip_dev_loopback_xmit()

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/netfilter.c b/net/core/netfilter.c
index 92c5182479..22a8f127c4 100644
--- a/net/core/netfilter.c
+++ b/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/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 38f69532a0..24fe3e00b4 100644
--- a/net/ipv4/ip_output.c
+++ b/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;
 }