svn commit: r186482 - projects/tcp_ffcaia2008_8.x/sys/netinet

[Lawrence Stewart]

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;