2008-02-14 01:00:50

by Jeff Chua

[permalink] [raw]
Subject: nf_conntrack - still missing one critical patch

Jozsef, Krzysztof

Have you had a chance to take a look at this missing bit?

Thanks,
Jeff.


On Feb 10, 2008 11:06 PM, Jeff Chua <[email protected]> wrote:
>
> On Feb 5, 2008 9:47 PM, Patrick McHardy wrote:
> >> On Feb 5, 2008 4:16 PM, Jozsef Kadlecsik wrote:
> >> Patrick, I suppose you need a patch against the latest git, don't you?
> > Yes, please. I'll take you first patch for -stable though if you
> > send me a Signed-off-by: line.
>
> Please note the lastest git commit is missing one part (which was in
> Jozsef's original patch).
>
> commit b2155e7f70b3f058efe94c0c459db023b05057bd
> Author: Jozsef Kadlecsik <[email protected]>
> Date: Thu Feb 7 17:54:56 2008 -0800
>
> [NETFILTER]: nf_conntrack: TCP conntrack reopening fix
>
>
> I've tested the following missing patch, and it solves the cups slow
> printing problem.
>
>
> Thanks,
> Jeff
>
> --- a/net/netfilter/nf_conntrack_proto_tcp.c.org 2008-02-10 22:45:49 +0800
> +++ a/net/netfilter/nf_conntrack_proto_tcp.c 2008-02-10 22:45:56 +0800
> @@ -945,7 +945,7 @@
>
> ct->proto.tcp.state = new_state;
> if (old_state != new_state
> - && new_state == TCP_CONNTRACK_CLOSE)
>
> + && new_state == TCP_CONNTRACK_FIN_WAIT)
> ct->proto.tcp.seen[dir].flags |= IP_CT_TCP_FLAG_CLOSE_INIT;
> timeout = ct->proto.tcp.retrans >= nf_ct_tcp_max_retrans
> && tcp_timeouts[new_state] > nf_ct_tcp_timeout_max_retrans
>