Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765650AbYBNPCy (ORCPT ); Thu, 14 Feb 2008 10:02:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756053AbYBNPCm (ORCPT ); Thu, 14 Feb 2008 10:02:42 -0500 Received: from smtp-in.kfki.hu ([148.6.0.25]:50447 "EHLO smtp0.kfki.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752694AbYBNPCk (ORCPT ); Thu, 14 Feb 2008 10:02:40 -0500 Date: Thu, 14 Feb 2008 16:02:29 +0100 (CET) From: Jozsef Kadlecsik To: Jeff Chua cc: Patrick McHardy , lkml , Krzysztof Piotr Oledzki , "David S. Miller" , cups-bugs , Netfilter Development Mailinglist , Linus Torvalds Subject: Re: cups slow on linux-2.6.24 In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 47 Hi, On Sun, 10 Feb 2008, Jeff Chua wrote: > Please note the lastest git commit is missing one part (which was in Jozsef's > original patch). Sorry everyone, that's my fault: the patch I sent for the stable branch was correct, however I mistyped a state in the patch for the newest git tree - Jeff spotted it, thanks! So here follows the patch against the newest git tree which corrects the mistake. Please review and commit. commit 1177898d185f382f491afaee3cdc752729c74bd2 Author: Jozsef Kadlecsik Date: Thu Feb 14 15:51:21 2008 +0100 Mistyped state corrected. Signed-off-by: Jozsef Kadlecsik diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 202d7fa..6256795 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -945,7 +945,7 @@ static int tcp_packet(struct nf_conn *ct, 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 Best regards, Jozsef - E-mail : kadlec@blackhole.kfki.hu, kadlec@sunserv.kfki.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : KFKI Research Institute for Particle and Nuclear Physics H-1525 Budapest 114, POB. 49, Hungary -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/