From owner-svn-src-projects@FreeBSD.ORG Thu Dec 25 01:59:44 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E00651065674; Thu, 25 Dec 2008 01:59:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CD6F28FC12; Thu, 25 Dec 2008 01:59:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBP1xidq000290; Thu, 25 Dec 2008 01:59:44 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBP1xiv9000287; Thu, 25 Dec 2008 01:59:44 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200812250159.mBP1xiv9000287@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 25 Dec 2008 01:59:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186482 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2008 01:59:45 -0000 Author: lstewart Date: Thu Dec 25 01:59:44 2008 New Revision: 186482 URL: http://svn.freebsd.org/changeset/base/186482 Log: Fix yesterday's botched IFC and make the patch work with the recent vimage changes. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_subr.c projects/tcp_ffcaia2008_8.x/sys/netinet/vinet.h Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c Thu Dec 25 00:01:29 2008 (r186481) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c Thu Dec 25 01:59:44 2008 (r186482) @@ -117,6 +117,8 @@ int tcp_insecure_rst; int tcp_do_autorcvbuf; int tcp_autorcvbuf_inc; int tcp_autorcvbuf_max; +int tcp_do_rfc3465; +int tcp_abc_l_var; #endif SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_STATS, stats, @@ -144,8 +146,6 @@ SYSCTL_V_INT(V_NET, vnet_inet, _net_inet tcp_do_rfc3390, 0, "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); -static int tcp_do_rfc3465 = 1; -static int tcp_abc_l_var = 2; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, rfc3465, CTLFLAG_RW, tcp_do_rfc3465, 0, "Enable RFC 3465 (Appropriate Byte Counting)"); @@ -153,8 +153,6 @@ SYSCTL_V_INT(V_NET, vnet_inet, _net_inet tcp_abc_l_var, 2, "Cap the max cwnd increment during slow-start to this number of segments"); -int tcp_do_ecn = 0; -int tcp_ecn_maxretries = 1; SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_subr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_subr.c Thu Dec 25 00:01:29 2008 (r186481) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_subr.c Thu Dec 25 01:59:44 2008 (r186482) @@ -316,6 +316,8 @@ tcp_init(void) V_tcp_do_autorcvbuf = 1; V_tcp_autorcvbuf_inc = 16*1024; V_tcp_autorcvbuf_max = 256*1024; + V_tcp_do_rfc3465 = 1; + V_tcp_abc_l_var = 2; V_tcp_mssdflt = TCP_MSS; #ifdef INET6 Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/vinet.h ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/vinet.h Thu Dec 25 00:01:29 2008 (r186481) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/vinet.h Thu Dec 25 01:59:44 2008 (r186482) @@ -128,7 +128,7 @@ struct vnet_inet { int _tcp_do_rfc3042; int _tcp_do_rfc3390; int _tcp_do_rfc3465; - int _tcp_abc_l_var + int _tcp_abc_l_var; int _tcp_do_ecn; int _tcp_ecn_maxretries; int _tcp_insecure_rst;