diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:45:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:45:19 -0700 |
| commit | 4a4f8fdba6f5a34ca90f426021e17491a30202da (patch) | |
| tree | 6eb8be6c9542845321252b1d64394a2c2ea84dd0 /net/ipv4/ip_input.c | |
| parent | 2c6e5a839f92591a4bc6cac4a575d42151645af3 (diff) | |
| parent | 90f66914c89b0be63548d4387d1211280aa7bc8e (diff) | |
| download | kernel-crypto-4a4f8fdba6f5a34ca90f426021e17491a30202da.tar.gz kernel-crypto-4a4f8fdba6f5a34ca90f426021e17491a30202da.tar.xz kernel-crypto-4a4f8fdba6f5a34ca90f426021e17491a30202da.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 4e47a2658c7..af2ec88bbb2 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -184,6 +184,7 @@ int ip_call_ra_chain(struct sk_buff *skb) raw_rcv(last, skb2); } last = sk; + nf_reset(skb); } } @@ -200,10 +201,6 @@ static inline int ip_local_deliver_finish(struct sk_buff *skb) { int ihl = skb->nh.iph->ihl*4; -#ifdef CONFIG_NETFILTER_DEBUG - nf_debug_ip_local_deliver(skb); -#endif /*CONFIG_NETFILTER_DEBUG*/ - __skb_pull(skb, ihl); /* Free reference early: we don't need it any more, and it may |