aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-05-03 19:21:37 -0400
committerDavid S. Miller <davem@davemloft.net>2005-05-03 19:21:37 -0400
commitbd96535b81ad09d7593cc75093534acb984d3dc9 (patch)
treef1b7611ba309d776c0289955a62e675f994fd63f
parente4f8ab00cf3599ecb8110c0a838cd15d013b79e5 (diff)
[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>
-rw-r--r--net/core/netfilter.c2
-rw-r--r--net/ipv4/ip_output.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/net/core/netfilter.c b/net/core/netfilter.c
index 92c51824797d..22a8f127c4aa 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)
236 debug_print_hooks_ip(newskb->nf_debug); 236 debug_print_hooks_ip(newskb->nf_debug);
237 nf_dump_skb(PF_INET, newskb); 237 nf_dump_skb(PF_INET, newskb);
238 } 238 }
239 /* Clear to avoid confusing input check */
240 newskb->nf_debug = 0;
241} 239}
242 240
243void nf_debug_ip_finish_output2(struct sk_buff *skb) 241void nf_debug_ip_finish_output2(struct sk_buff *skb)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 38f69532a029..24fe3e00b42b 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)
111#ifdef CONFIG_NETFILTER_DEBUG 111#ifdef CONFIG_NETFILTER_DEBUG
112 nf_debug_ip_loopback_xmit(newskb); 112 nf_debug_ip_loopback_xmit(newskb);
113#endif 113#endif
114 nf_reset(newskb);
114 netif_rx(newskb); 115 netif_rx(newskb);
115 return 0; 116 return 0;
116} 117}