summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-05-03 16:21:37 -0700
committerDavid S. Miller <davem@davemloft.net>2005-05-03 16:21:37 -0700
commitbd96535b81ad09d7593cc75093534acb984d3dc9 (patch)
treef1b7611ba309d776c0289955a62e675f994fd63f /net
parente4f8ab00cf3599ecb8110c0a838cd15d013b79e5 (diff)
downloadlinux-bd96535b81ad09d7593cc75093534acb984d3dc9.tar.gz
linux-bd96535b81ad09d7593cc75093534acb984d3dc9.tar.bz2
linux-bd96535b81ad09d7593cc75093534acb984d3dc9.zip
[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>
Diffstat (limited to '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)
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 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)
#ifdef CONFIG_NETFILTER_DEBUG
nf_debug_ip_loopback_xmit(newskb);
#endif
+ nf_reset(newskb);
netif_rx(newskb);
return 0;
}