diff options
author | glebius <glebius@FreeBSD.org> | 2016-01-21 22:34:51 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2016-01-21 22:34:51 +0000 |
commit | a1e3038e6879c24a6f2fa064fc09facb25ecd981 (patch) | |
tree | 76449b0430e7ca5f443ad64bf0f18f8bbe3d7d7d | |
parent | b0b805d8117e268d4d11c207903b437bdaa5d2a0 (diff) | |
download | FreeBSD-src-a1e3038e6879c24a6f2fa064fc09facb25ecd981.zip FreeBSD-src-a1e3038e6879c24a6f2fa064fc09facb25ecd981.tar.gz |
- 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
-rw-r--r-- | sys/netinet/cc/cc.c | 3 | ||||
-rw-r--r-- | sys/netinet/cc/cc_cdg.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_chd.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_cubic.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_dctcp.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_hd.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_htcp.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_newreno.c | 4 | ||||
-rw-r--r-- | sys/netinet/cc/cc_vegas.c | 5 | ||||
-rw-r--r-- | sys/netinet/tcp_cc.h (renamed from sys/netinet/cc.h) | 11 | ||||
-rw-r--r-- | sys/netinet/tcp_input.c | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_output.c | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_stacks/fastpath.c | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_subr.c | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_timer.c | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_usrreq.c | 3 |
16 files changed, 36 insertions, 29 deletions
diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index f1cf328..718bfb4 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -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> diff --git a/sys/netinet/cc/cc_cdg.c b/sys/netinet/cc/cc_cdg.c index b0bf191..ec4e73c 100644 --- a/sys/netinet/cc/cc_cdg.c +++ b/sys/netinet/cc/cc_cdg.c @@ -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> diff --git a/sys/netinet/cc/cc_chd.c b/sys/netinet/cc/cc_chd.c index 4206237..67cf5f3 100644 --- a/sys/netinet/cc/cc_chd.c +++ b/sys/netinet/cc/cc_chd.c @@ -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> diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 339ee6f..5e9404a 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -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> diff --git a/sys/netinet/cc/cc_dctcp.c b/sys/netinet/cc/cc_dctcp.c index 069c2b0..63e4250 100644 --- a/sys/netinet/cc/cc_dctcp.c +++ b/sys/netinet/cc/cc_dctcp.c @@ -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))) diff --git a/sys/netinet/cc/cc_hd.c b/sys/netinet/cc/cc_hd.c index d6ba1fd..a9d6f87 100644 --- a/sys/netinet/cc/cc_hd.c +++ b/sys/netinet/cc/cc_hd.c @@ -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> diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 3f1681c..e5d1c9b 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -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. */ diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 31b70cc..e887d0d 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -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); diff --git a/sys/netinet/cc/cc_vegas.c b/sys/netinet/cc/cc_vegas.c index 8e193ae..db894ab 100644 --- a/sys/netinet/cc/cc_vegas.c +++ b/sys/netinet/cc/cc_vegas.c @@ -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> diff --git a/sys/netinet/cc.h b/sys/netinet/tcp_cc.h index 481b401..4a2b0c8 100644 --- a/sys/netinet/cc.h +++ b/sys/netinet/tcp_cc.h @@ -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_ */ diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index bb50d3b..7b2193e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -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 diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 4a4e7eb5..55cf209 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -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 diff --git a/sys/netinet/tcp_stacks/fastpath.c b/sys/netinet/tcp_stacks/fastpath.c index 626a7dc..c3664df 100644 --- a/sys/netinet/tcp_stacks/fastpath.c +++ b/sys/netinet/tcp_stacks/fastpath.c @@ -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 */ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d68a8a6..7de745e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -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 diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index fb4ff11..0dfeb13 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -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 diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 76bc8aa..c084f92 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -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 |