diff options
| author |   Phil Oester <kernel@linuxace.com> | 2005-07-12 11:57:52 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2005-07-12 11:57:52 -0700 |
| commit | 84531c24f27b02daa8e54e2bb6dc74a730fdf0a5 (patch) | |
| tree | 756825122b40af8ea2db132e8c9033d9ab3785e5 /net/ipv4/netfilter | |
| parent | [NET]: move config options out to individual protocols (diff) | |
| download | linux-dev-84531c24f27b02daa8e54e2bb6dc74a730fdf0a5.tar.xz linux-dev-84531c24f27b02daa8e54e2bb6dc74a730fdf0a5.zip | |
[NETFILTER]: Revert nf_reset change
Revert the nf_reset change that caused so much trouble, drop conntrack
references manually before packets are queued to packet sockets.
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_standalone.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 42dc95102873..1dd824f3cf0a 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -432,6 +432,13 @@ static unsigned int ip_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { +#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE) + /* Previously seen (loopback)? Ignore. Do this before + fragment check. */ + if ((*pskb)->nfct) + return NF_ACCEPT; +#endif + /* Gather fragments. */ if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) { *pskb = ip_ct_gather_frags(*pskb, |