Site Navigation

Date:      Wed, 27 Jan 2016 17:59:39 +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: r294931 - in head: share/man/man9 sys/netinet sys/netinet/cc sys/netinet/tcp_stacks
Message-ID:  <201601271759.u0RHxdP2038464@repo.freebsd.org>

---

next in thread | raw e-mail | index | archive | help

---

Author: glebius
Date: Wed Jan 27 17:59:39 2016
New Revision: 294931
URL: https://svnweb.freebsd.org/changeset/base/294931

Log:
  Rename netinet/tcp_cc.h to netinet/cc/cc.h.
  
  Discussed with:	lstewart

Added:
  head/sys/netinet/cc/cc.h
     - copied, changed from r294930, head/sys/netinet/tcp_cc.h
Deleted:
  head/sys/netinet/tcp_cc.h
Modified:
  head/share/man/man9/mod_cc.9
  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/share/man/man9/mod_cc.9
==============================================================================
--- head/share/man/man9/mod_cc.9	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/share/man/man9/mod_cc.9	Wed Jan 27 17:59:39 2016	(r294931)
@@ -41,7 +41,7 @@
 .Nd Modular Congestion Control
 .Sh SYNOPSIS
 .In netinet/tcp.h
-.In netinet/tcp_cc.h
+.In netinet/cc/cc.h
 .In netinet/cc/cc_module.h
 .Fn DECLARE_CC_MODULE "ccname" "ccalgo"
 .Fn CCV "ccv" "what"

Modified: head/sys/netinet/cc/cc.c
==============================================================================
--- head/sys/netinet/cc/cc.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_pcb.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 
 #include <netinet/cc/cc_module.h>
 

Copied and modified: head/sys/netinet/cc/cc.h (from r294930, head/sys/netinet/tcp_cc.h)
==============================================================================
--- head/sys/netinet/tcp_cc.h	Wed Jan 27 17:55:01 2016	(r294930, copy source)
+++ head/sys/netinet/cc/cc.h	Wed Jan 27 17:59:39 2016	(r294931)
@@ -48,8 +48,8 @@
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
-#ifndef _NETINET_TCP_CC_H_
-#define _NETINET_TCP_CC_H_
+#ifndef _NETINET_CC_CC_H_
+#define _NETINET_CC_CC_H_
 
 #if !defined(_KERNEL)
 #error "no user-servicable parts inside"
@@ -175,4 +175,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_TCP_CC_H_ */
+#endif /* _NETINET_CC_CC_H_ */

Modified: head/sys/netinet/cc/cc_cdg.c
==============================================================================
--- head/sys/netinet/cc/cc_cdg.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_cdg.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_chd.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_cubic.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_dctcp.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_hd.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_htcp.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_newreno.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/cc/cc_vegas.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 #include <netinet/cc/cc_module.h>
 
 #include <netinet/khelp/h_ertt.h>

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_input.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -107,7 +107,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_var.h>
 #include <netinet6/tcp6_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 #ifdef TCPPCAP
 #include <netinet/tcp_pcap.h>
 #endif

Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_output.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_stacks/fastpath.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -107,7 +107,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/tcp6_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/tcp_syncache.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_subr.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -95,7 +95,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_syncache.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif

Modified: head/sys/netinet/tcp_timer.c
==============================================================================
--- head/sys/netinet/tcp_timer.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_timer.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/cc.h>
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Wed Jan 27 17:55:01 2016	(r294930)
+++ head/sys/netinet/tcp_usrreq.c	Wed Jan 27 17:59:39 2016	(r294931)
@@ -90,7 +90,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/tcp_cc.h>
+#include <netinet/cc/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?201601271759.u0RHxdP2038464>

Legal Notices | © 1995-2025 The FreeBSD Project. All rights reserved.

Contact