Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932551AbVI3CY3 (ORCPT ); Thu, 29 Sep 2005 22:24:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932548AbVI3CYF (ORCPT ); Thu, 29 Sep 2005 22:24:05 -0400 Received: from smtp.osdl.org ([65.172.181.4]:19114 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S932539AbVI3CX7 (ORCPT ); Thu, 29 Sep 2005 22:23:59 -0400 Message-Id: <20050930022249.667419000@localhost.localdomain> References: <20050930022016.640197000@localhost.localdomain> Date: Thu, 29 Sep 2005 19:20:25 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org, "David S. Miller" Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Chuck Wolber , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Stephen Hemminger , netdev@vger.kernel.org, Joel Sing , Chris Wright Subject: [PATCH 09/10] [PATCH] tcp: set default congestion control correctly for incoming connections Content-Disposition: inline; filename=tcp-set-default-congestion-control-correctly.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1441 Lines: 36 -stable review patch. If anyone has any objections, please let us know. ------------------ Patch from Joel Sing to fix the default congestion control algorithm for incoming connections. If a new congestion control handler is added (via module), it should become the default for new connections. Instead, the incoming connections use reno. The cause is incorrect initialisation causes the tcp_init_congestion_control() function to return after the initial if test fails. Signed-off-by: Stephen Hemminger Acked-by: "David S. Miller" Signed-off-by: Chris Wright --- net/ipv4/tcp_minisocks.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.13.y/net/ipv4/tcp_minisocks.c =================================================================== --- linux-2.6.13.y.orig/net/ipv4/tcp_minisocks.c +++ linux-2.6.13.y/net/ipv4/tcp_minisocks.c @@ -774,7 +774,7 @@ struct sock *tcp_create_openreq_child(st newtp->frto_counter = 0; newtp->frto_highmark = 0; - newtp->ca_ops = &tcp_reno; + newtp->ca_ops = &tcp_init_congestion_ops; tcp_set_ca_state(newtp, TCP_CA_Open); tcp_init_xmit_timers(newsk); -- - 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/