From owner-svn-src-all@freebsd.org Thu Jan 21 22:34:54 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 151BEA8C6A5; Thu, 21 Jan 2016 22:34:54 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5B161293; Thu, 21 Jan 2016 22:34:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LMYqkI009964; Thu, 21 Jan 2016 22:34:52 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LMYpKT009948; Thu, 21 Jan 2016 22:34:51 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201601212234.u0LMYpKT009948@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 21 Jan 2016 22:34:51 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 22:34:54 -0000 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 -#include #include #include +#include #include +#include #include 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 -#include +#include #include #include #include - +#include #include #include 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 -#include +#include #include #include #include - +#include #include #include 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 -#include +#include #include #include #include - +#include #include #include 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 -#include +#include #include #include - +#include #include #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 -#include +#include #include #include #include - +#include #include #include 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 -#include +#include #include #include #include - +#include #include /* 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 -#include +#include #include #include - +#include #include 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 -#include -#include +#include #include #include - +#include #include #include 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 +#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 #include #include #include @@ -101,12 +100,14 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include #endif +#include #include #include #include #include #include #include +#include #ifdef TCPPCAP #include #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 #include -#include #include #include #include @@ -71,12 +70,14 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include #endif +#include #define TCPOUTFLAGS #include #include #include #include #include +#include #ifdef TCPPCAP #include #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 #include #include #include @@ -100,6 +99,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -107,6 +107,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef TCPDEBUG #include #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 #include -#include #include #include #include @@ -88,11 +87,13 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include #endif +#include #include #include #include #include #include +#include #ifdef INET6 #include #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 #include -#include #include #include #include @@ -65,9 +64,11 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #include #include #include +#include #ifdef INET6 #include #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 #include -#include #include #include #include @@ -85,11 +84,13 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_RFC7413 #include #endif +#include #include #include #include #include #include +#include #ifdef TCPPCAP #include #endif