Date: Thu, 21 Jan 2016 22:34:51 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294535 - in head/sys/netinet: . cc tcp_stacks Message-ID: <201601212234.u0LMYpKT009948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Jan 21 22:34:51 2016 New Revision: 294535 URL: https://svnweb.freebsd.org/changeset/base/294535 Log: - Rename cc.h to more meaningful tcp_cc.h. - Declare it a kernel only include, which it already is. - Don't include tcp.h implicitly from tcp_cc.h Added: head/sys/netinet/tcp_cc.h - copied, changed from r294534, head/sys/netinet/cc.h Deleted: head/sys/netinet/cc.h Modified: head/sys/netinet/cc/cc.c head/sys/netinet/cc/cc_cdg.c head/sys/netinet/cc/cc_chd.c head/sys/netinet/cc/cc_cubic.c head/sys/netinet/cc/cc_dctcp.c head/sys/netinet/cc/cc_hd.c head/sys/netinet/cc/cc_htcp.c head/sys/netinet/cc/cc_newreno.c head/sys/netinet/cc/cc_vegas.c head/sys/netinet/tcp_input.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_stacks/fastpath.c head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_timer.c head/sys/netinet/tcp_usrreq.c Modified: head/sys/netinet/cc/cc.c ============================================================================== --- head/sys/netinet/cc/cc.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc.c Thu Jan 21 22:34:51 2016 (r294535) @@ -65,10 +65,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_pcb.h> +#include <netinet/tcp.h> #include <netinet/tcp_var.h> +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> Modified: head/sys/netinet/cc/cc_cdg.c ============================================================================== --- head/sys/netinet/cc/cc_cdg.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_cdg.c Thu Jan 21 22:34:51 2016 (r294535) @@ -65,11 +65,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> #include <netinet/khelp/h_ertt.h> Modified: head/sys/netinet/cc/cc_chd.c ============================================================================== --- head/sys/netinet/cc/cc_chd.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_chd.c Thu Jan 21 22:34:51 2016 (r294535) @@ -67,11 +67,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> #include <netinet/khelp/h_ertt.h> Modified: head/sys/netinet/cc/cc_cubic.c ============================================================================== --- head/sys/netinet/cc/cc_cubic.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_cubic.c Thu Jan 21 22:34:51 2016 (r294535) @@ -59,11 +59,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_cubic.h> #include <netinet/cc/cc_module.h> Modified: head/sys/netinet/cc/cc_dctcp.c ============================================================================== --- head/sys/netinet/cc/cc_dctcp.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_dctcp.c Thu Jan 21 22:34:51 2016 (r294535) @@ -50,10 +50,10 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> #define CAST_PTR_INT(X) (*((int*)(X))) Modified: head/sys/netinet/cc/cc_hd.c ============================================================================== --- head/sys/netinet/cc/cc_hd.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_hd.c Thu Jan 21 22:34:51 2016 (r294535) @@ -68,11 +68,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> #include <netinet/khelp/h_ertt.h> Modified: head/sys/netinet/cc/cc_htcp.c ============================================================================== --- head/sys/netinet/cc/cc_htcp.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_htcp.c Thu Jan 21 22:34:51 2016 (r294535) @@ -62,11 +62,11 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> /* Fixed point math shifts. */ Modified: head/sys/netinet/cc/cc_newreno.c ============================================================================== --- head/sys/netinet/cc/cc_newreno.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_newreno.c Thu Jan 21 22:34:51 2016 (r294535) @@ -62,10 +62,10 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> +#include <netinet/tcp.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> static void newreno_ack_received(struct cc_var *ccv, uint16_t type); Modified: head/sys/netinet/cc/cc_vegas.c ============================================================================== --- head/sys/netinet/cc/cc_vegas.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/cc/cc_vegas.c Thu Jan 21 22:34:51 2016 (r294535) @@ -69,11 +69,10 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> -#include <netinet/cc.h> -#include <netinet/tcp_seq.h> +#include <netinet/tcp.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> - +#include <netinet/tcp_cc.h> #include <netinet/cc/cc_module.h> #include <netinet/khelp/h_ertt.h> Copied and modified: head/sys/netinet/tcp_cc.h (from r294534, head/sys/netinet/cc.h) ============================================================================== --- head/sys/netinet/cc.h Thu Jan 21 22:24:20 2016 (r294534, copy source) +++ head/sys/netinet/tcp_cc.h Thu Jan 21 22:34:51 2016 (r294535) @@ -48,11 +48,12 @@ * http://caia.swin.edu.au/urp/newtcp/ */ -#ifndef _NETINET_CC_H_ -#define _NETINET_CC_H_ +#ifndef _NETINET_TCP_CC_H_ +#define _NETINET_TCP_CC_H_ -/* XXX: TCP_CA_NAME_MAX define lives in tcp.h for compat reasons. */ -#include <netinet/tcp.h> +#if !defined(_KERNEL) +#error "no user-servicable parts inside" +#endif /* Global CC vars. */ extern STAILQ_HEAD(cc_head, cc_algo) cc_list; @@ -171,4 +172,4 @@ extern struct rwlock cc_list_lock; #define CC_LIST_WUNLOCK() rw_wunlock(&cc_list_lock) #define CC_LIST_LOCK_ASSERT() rw_assert(&cc_list_lock, RA_LOCKED) -#endif /* _NETINET_CC_H_ */ +#endif /* _NETINET_TCP_CC_H_ */ Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_input.c Thu Jan 21 22:34:51 2016 (r294535) @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$"); #define TCPSTATES /* for logging */ -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_pcb.h> @@ -101,12 +100,14 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include <netinet/tcp_fastopen.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 <netinet6/tcp6_var.h> #include <netinet/tcpip.h> +#include <netinet/tcp_cc.h> #ifdef TCPPCAP #include <netinet/tcp_pcap.h> #endif Modified: head/sys/netinet/tcp_output.c ============================================================================== --- head/sys/netinet/tcp_output.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_output.c Thu Jan 21 22:34:51 2016 (r294535) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/vnet.h> -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_systm.h> @@ -71,12 +70,14 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include <netinet/tcp_fastopen.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/tcp_cc.h> #ifdef TCPPCAP #include <netinet/tcp_pcap.h> #endif Modified: head/sys/netinet/tcp_stacks/fastpath.c ============================================================================== --- head/sys/netinet/tcp_stacks/fastpath.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_stacks/fastpath.c Thu Jan 21 22:34:51 2016 (r294535) @@ -86,7 +86,6 @@ __FBSDID("$FreeBSD$"); #define TCPSTATES /* for logging */ -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_pcb.h> @@ -100,6 +99,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp6.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6_var.h> +#include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> @@ -107,6 +107,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/tcp6_var.h> #include <netinet/tcpip.h> #include <netinet/tcp_syncache.h> +#include <netinet/tcp_cc.h> #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif /* TCPDEBUG */ Modified: head/sys/netinet/tcp_subr.c ============================================================================== --- head/sys/netinet/tcp_subr.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_subr.c Thu Jan 21 22:34:51 2016 (r294535) @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include <net/if_var.h> #include <net/vnet.h> -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_pcb.h> @@ -88,11 +87,13 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include <netinet/tcp_fastopen.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/tcp_syncache.h> +#include <netinet/tcp_cc.h> #ifdef INET6 #include <netinet6/tcp6_var.h> #endif Modified: head/sys/netinet/tcp_timer.c ============================================================================== --- head/sys/netinet/tcp_timer.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_timer.c Thu Jan 21 22:34:51 2016 (r294535) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include <net/vnet.h> #include <net/netisr.h> -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_pcb.h> @@ -65,9 +64,11 @@ __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/tcp_cc.h> #ifdef INET6 #include <netinet6/tcp6_var.h> #endif Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Thu Jan 21 22:24:20 2016 (r294534) +++ head/sys/netinet/tcp_usrreq.c Thu Jan 21 22:34:51 2016 (r294535) @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/vnet.h> -#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_kdtrace.h> #include <netinet/in_pcb.h> @@ -85,11 +84,13 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include <netinet/tcp_fastopen.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/tcp_cc.h> #ifdef TCPPCAP #include <netinet/tcp_pcap.h> #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601212234.u0LMYpKT009948>