Date: Tue, 3 Feb 2009 07:04:10 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r188053 - in projects/tcp_cc_7.x/sys: . netinet Message-ID: <200902030704.n1374Ach020283@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Tue Feb 3 07:04:10 2009 New Revision: 188053 URL: http://svn.freebsd.org/changeset/base/188053 Log: Merge r188049,188051,188052 from tcp_cc_8.x (with minor tweaks). Modified: projects/tcp_cc_7.x/sys/ (props changed) projects/tcp_cc_7.x/sys/netinet/cc.c projects/tcp_cc_7.x/sys/netinet/cc.h projects/tcp_cc_7.x/sys/netinet/cc_cubic.c projects/tcp_cc_7.x/sys/netinet/cc_htcp.c projects/tcp_cc_7.x/sys/netinet/tcp_output.c projects/tcp_cc_7.x/sys/netinet/tcp_subr.c projects/tcp_cc_7.x/sys/netinet/tcp_timer.c projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c Modified: projects/tcp_cc_7.x/sys/netinet/cc.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/cc.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/cc.c Tue Feb 3 07:04:10 2009 (r188053) @@ -35,24 +35,22 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/kernel.h> #include <sys/libkern.h> #include <sys/lock.h> -#include <sys/rwlock.h> +#include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/rwlock.h> +#include <sys/sbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/sbuf.h> +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_pcb.h> -#include <netinet/tcp.h> #include <netinet/tcp_seq.h> -#include <netinet/tcp_fsm.h> -#include <netinet/cc.h> - +#include <netinet/tcp_var.h> /* list of available cc algorithms on the current system */ struct cc_head cc_list = STAILQ_HEAD_INITIALIZER(cc_list); Modified: projects/tcp_cc_7.x/sys/netinet/cc.h ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/cc.h Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/cc.h Tue Feb 3 07:04:10 2009 (r188053) @@ -34,8 +34,8 @@ #ifndef _NETINET_CC_H_ #define _NETINET_CC_H_ -#include <sys/queue.h> -#include <netinet/tcp_var.h> +/* Needed for TCP_CA_NAME_MAX define which lives in tcp.h for compat reasons */ +#include <netinet/tcp.h> /* * Global CC vars Modified: projects/tcp_cc_7.x/sys/netinet/cc_cubic.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/cc_cubic.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/cc_cubic.c Tue Feb 3 07:04:10 2009 (r188053) @@ -41,11 +41,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> -#include <sys/systm.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/queue.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sysctl.h> +#include <sys/systm.h> #include <sys/time.h> #include <netinet/cc.h> Modified: projects/tcp_cc_7.x/sys/netinet/cc_htcp.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/cc_htcp.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/cc_htcp.c Tue Feb 3 07:04:10 2009 (r188053) @@ -44,14 +44,18 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> -#include <sys/systm.h> #include <sys/malloc.h> #include <sys/module.h> -#include <sys/sysctl.h> +#include <sys/queue.h> +#include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sysctl.h> +#include <sys/systm.h> + +#include <netinet/cc.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> -#include <netinet/cc.h> +#include <netinet/tcp_var.h> /* useful defines */ #define MODNAME "HTCP congestion control" Modified: projects/tcp_cc_7.x/sys/netinet/tcp_output.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/tcp_output.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/tcp_output.c Tue Feb 3 07:04:10 2009 (r188053) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -63,14 +64,12 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #endif -#include <netinet/tcp.h> #define TCPOUTFLAGS #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/tcpip.h> -#include <netinet/cc.h> #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif Modified: projects/tcp_cc_7.x/sys/netinet/tcp_subr.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/tcp_subr.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/tcp_subr.c Tue Feb 3 07:04:10 2009 (r188053) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/if.h> +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -81,14 +82,12 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #endif #include <netinet/ip_icmp.h> -#include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/tcp_syncache.h> #include <netinet/tcp_offload.h> -#include <netinet/cc.h> #ifdef INET6 #include <netinet6/tcp6_var.h> #endif Modified: projects/tcp_cc_7.x/sys/netinet/tcp_timer.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/tcp_timer.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/tcp_timer.c Tue Feb 3 07:04:10 2009 (r188053) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> @@ -55,12 +56,10 @@ __FBSDID("$FreeBSD$"); #include <netinet6/in6_pcb.h> #endif #include <netinet/ip_var.h> -#include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/tcpip.h> -#include <netinet/cc.h> #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif Modified: projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c ============================================================================== --- projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c Tue Feb 3 06:52:29 2009 (r188052) +++ projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c Tue Feb 3 07:04:10 2009 (r188053) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_systm.h> #ifdef INET6 @@ -76,13 +77,11 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_var.h> #include <netinet6/scope6_var.h> #endif -#include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/tcpip.h> -#include <netinet/cc.h> #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902030704.n1374Ach020283>