head	1.8;
access;
symbols
	RELENG_8_4:1.7.0.2
	RELENG_9_1_0_RELEASE:1.6.4.1.4.2
	RELENG_9_1:1.6.4.1.0.4
	RELENG_9_1_BP:1.6.4.1
	RELENG_8_3_0_RELEASE:1.6.2.7.2.1
	RELENG_8_3:1.6.2.7.0.2
	RELENG_8_3_BP:1.6.2.7
	RELENG_9_0_0_RELEASE:1.6.4.1.2.1
	RELENG_9_0:1.6.4.1.0.2
	RELENG_9_0_BP:1.6.4.1
	RELENG_9:1.6.0.4
	RELENG_9_BP:1.6
	RELENG_8:1.6.0.2;
locks; strict;
comment	@# @;


1.8
date	2013.07.03.00.30.53;	author svnexp;	state Exp;
branches;
next	1.7;

1.7
date	2012.11.17.01.52.54;	author svnexp;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2011.02.01.07.05.14;	author lstewart;	state Exp;
branches
	1.6.2.1
	1.6.4.1;
next	1.5;

1.5
date	2011.02.01.06.42.46;	author lstewart;	state Exp;
branches;
next	1.4;

1.4
date	2011.02.01.06.17.00;	author lstewart;	state Exp;
branches;
next	1.3;

1.3
date	2010.12.02.06.40.21;	author lstewart;	state Exp;
branches;
next	1.2;

1.2
date	2010.12.02.06.05.44;	author lstewart;	state Exp;
branches;
next	1.1;

1.1
date	2010.12.02.03.10.35;	author lstewart;	state Exp;
branches;
next	;

1.7.2.1
date	2012.11.17.01.52.54;	author svnexp;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2013.03.28.13.05.18;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2011.05.28.05.04.53;	author lstewart;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2011.05.28.05.04.53;	author lstewart;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	2011.05.28.05.17.52;	author lstewart;	state Exp;
branches;
next	1.6.2.4;

1.6.2.4
date	2011.05.28.05.28.00;	author lstewart;	state Exp;
branches;
next	1.6.2.5;

1.6.2.5
date	2011.05.28.08.28.37;	author lstewart;	state Exp;
branches;
next	1.6.2.6;

1.6.2.6
date	2011.05.28.08.32.17;	author lstewart;	state Exp;
branches;
next	1.6.2.7;

1.6.2.7
date	2011.05.28.08.34.30;	author lstewart;	state Exp;
branches
	1.6.2.7.2.1;
next	1.6.2.8;

1.6.2.8
date	2012.11.17.10.36.55;	author svnexp;	state Exp;
branches;
next	1.6.2.9;

1.6.2.9
date	2013.07.07.14.22.15;	author svnexp;	state Exp;
branches;
next	;

1.6.2.7.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.2.7.2.2;

1.6.2.7.2.2
date	2012.11.17.08.25.32;	author svnexp;	state Exp;
branches;
next	;

1.6.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.6.4.1.2.1
	1.6.4.1.4.1;
next	1.6.4.2;

1.6.4.2
date	2012.11.17.11.37.16;	author svnexp;	state Exp;
branches;
next	1.6.4.3;

1.6.4.3
date	2013.07.07.15.02.25;	author svnexp;	state Exp;
branches;
next	;

1.6.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.6.4.1.2.2;

1.6.4.1.2.2
date	2012.11.17.08.37.13;	author svnexp;	state Exp;
branches;
next	;

1.6.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.6.4.1.4.2;

1.6.4.1.4.2
date	2012.11.17.08.48.03;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252504
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/sys/modules/cc/Makefile 252504 2013-07-02 08:44:56Z lstewart $

SUBDIR=	cc_cdg \
	cc_chd \
	cc_cubic \
	cc_hd \
	cc_htcp \
	cc_vegas

.include <bsd.subdir.mk>
@


1.7
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/sys/modules/cc/Makefile 218155 2011-02-01 07:05:14Z lstewart $
d3 2
a4 1
SUBDIR=	cc_chd \
@


1.7.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:18 +0000
@
text
@d1 9
@


1.7.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 9
# $FreeBSD: releng/8.4/sys/modules/cc/Makefile 222413 2011-05-28 08:34:30Z lstewart $

SUBDIR=	cc_chd \
	cc_cubic \
	cc_hd \
	cc_htcp \
	cc_vegas

.include <bsd.subdir.mk>
@


1.6
log
@SVN rev 218155 on 2011-02-01 07:05:14Z by lstewart

Import an implementation of the CAIA-Hamilton-Delay (CHD) congestion control
algorithm described in the paper "Improved coexistence and loss tolerance for
delay based TCP congestion control" by Hayes and Armitage. It is implemented as
a kernel module compatible with the recently committed modular congestion
control framework.

CHD enhances the approach taken by the Hamilton-Delay (HD) algorithm to provide
tolerance to non-congestion related packet loss and improvements to coexistence
with loss-based congestion control algorithms. A key idea in improving
coexistence with loss-based congestion control algorithms is the use of a shadow
window, which attempts to track how NewReno's congestion window (cwnd) would
evolve. At the next packet loss congestion event, CHD uses the shadow window to
correct cwnd in a way that reduces the amount of unfairness CHD experiences when
competing with loss-based algorithms.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
MFC after:	3 months
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.4.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/cc/Makefile 218155 2011-02-01 07:05:14Z lstewart $
@


1.6.4.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252951
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/cc/Makefile 252951 2013-07-07 14:14:44Z lstewart $
d3 1
a3 2
SUBDIR=	cc_cdg \
	cc_chd \
@


1.6.4.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.6.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/cc/Makefile 218155 2011-02-01 07:05:14Z lstewart $
@


1.6.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.6.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/cc/Makefile 218155 2011-02-01 07:05:14Z lstewart $
@


1.6.2.1
log
@file Makefile was added on branch RELENG_8 on 2011-05-28 05:05:09 +0000
@
text
@d1 9
@


1.6.2.2
log
@SVN rev 222402 on 2011-05-28 05:04:53Z by lstewart

MFC r216109:

Add build infrastructure for the forthcoming CC algorithm modules.

Sponsored by:	FreeBSD Foundation
Submitted by:	David Hayes <dahayes at swin edu au>
@
text
@a0 5
# $FreeBSD$

SUBDIR=

.include <bsd.subdir.mk>
@


1.6.2.3
log
@SVN rev 222403 on 2011-05-28 05:17:52Z by lstewart

MFC r216114,217683:

Import a clean-room implementation of the experimental CUBIC congestion control
algorithm based on the Internet-Draft "draft-rhee-tcpm-cubic-02.txt". It is
implemented as a kernel module compatible with the recently committed modular
congestion control framework.

CUBIC was designed for provide increased throughput in fast and long-distance
networks. It attempts to maintain fairness when competing with legacy NewReno
TCP in lower speed scenarios where NewReno is able to operate adequately.  The
paper "CUBIC: A New TCP-Friendly High-Speed TCP Variant" provides additional
detail.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	rpaulo
@
text
@d3 1
a3 1
SUBDIR=	cc_cubic
@


1.6.2.4
log
@SVN rev 222404 on 2011-05-28 05:28:00Z by lstewart

MFC r216115:

Import a clean-room implementation of the experimental H-TCP congestion control
algorithm based on the Internet-Draft "draft-leith-tcp-htcp-06.txt". It is
implemented as a kernel module compatible with the recently committed modular
congestion control framework.

H-TCP was designed to provide increased throughput in fast and long-distance
networks. It attempts to maintain fairness when competing with legacy NewReno
TCP in lower speed scenarios where NewReno is able to operate adequately.  The
paper "H-TCP: A framework for congestion control in high-speed and long-distance
networks" provides additional detail.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	rpaulo
@
text
@d3 1
a3 2
SUBDIR=	cc_cubic \
	cc_htcp
@


1.6.2.5
log
@SVN rev 222411 on 2011-05-28 08:28:37Z by lstewart

MFC r218152,218156:

Import a clean-room implementation of the VEGAS congestion control algorithm
based on the paper "TCP Vegas: end to end congestion avoidance on a global
internet" by Brakmo and Peterson. It is implemented as a kernel module
compatible with the recently committed modular congestion control framework.

VEGAS uses network delay as a congestion indicator and unlike regular loss-based
algorithms, attempts to keep the network operating with stable queuing delays
and no congestion losses. By keeping network buffers used along the path within
a set range, queuing delays are kept low while maintaining high throughput.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
@
text
@d4 1
a4 2
	cc_htcp \
	cc_vegas
@


1.6.2.6
log
@SVN rev 222412 on 2011-05-28 08:32:17Z by lstewart

MFC 218153:

Import a clean-room implementation of the Hamilton-Delay (HD) congestion control
algorithm based on the paper "A strategy for fair coexistence of loss and
delay-based congestion control algorithms" by Budzisz, Stanojevic, Shorten and
Baker. It is implemented as a kernel module compatible with the recently
committed modular congestion control framework.

HD uses a probabilistic approach to reacting to delay-based congestion. The
probability of reducing cwnd is zero when the queuing delay is very small,
increasing to a maximum at a set threshold, then back down to zero again when
the queuing delay is high. Normal operation keeps the queuing delay below the
set threshold. However, since loss-based congestion control algorithms push the
queuing delay high when probing for bandwidth, having the probability of
reducing cwnd drop back to zero for high delays allows HD to compete with
loss-based algorithms.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
@
text
@a3 1
	cc_hd \
@


1.6.2.7
log
@SVN rev 222413 on 2011-05-28 08:34:30Z by lstewart

MFC 218155:

Import an implementation of the CAIA-Hamilton-Delay (CHD) congestion control
algorithm described in the paper "Improved coexistence and loss tolerance for
delay based TCP congestion control" by Hayes and Armitage. It is implemented as
a kernel module compatible with the recently committed modular congestion
control framework.

CHD enhances the approach taken by the Hamilton-Delay (HD) algorithm to provide
tolerance to non-congestion related packet loss and improvements to coexistence
with loss-based congestion control algorithms. A key idea in improving
coexistence with loss-based congestion control algorithms is the use of a shadow
window, which attempts to track how NewReno's congestion window (cwnd) would
evolve. At the next packet loss congestion event, CHD uses the shadow window to
correct cwnd in a way that reduces the amount of unfairness CHD experiences when
competing with loss-based algorithms.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
@
text
@d3 1
a3 2
SUBDIR=	cc_chd \
	cc_cubic \
@


1.6.2.8
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/cc/Makefile 222413 2011-05-28 08:34:30Z lstewart $
@


1.6.2.9
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252952
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/cc/Makefile 252952 2013-07-07 14:20:00Z lstewart $
d3 1
a3 2
SUBDIR=	cc_cdg \
	cc_chd \
@


1.6.2.7.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.2.7.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/cc/Makefile 222413 2011-05-28 08:34:30Z lstewart $
@


1.5
log
@SVN rev 218153 on 2011-02-01 06:42:46Z by lstewart

Import a clean-room implementation of the Hamilton-Delay (HD) congestion control
algorithm based on the paper "A strategy for fair coexistence of loss and
delay-based congestion control algorithms" by Budzisz, Stanojevic, Shorten and
Baker. It is implemented as a kernel module compatible with the recently
committed modular congestion control framework.

HD uses a probabilistic approach to reacting to delay-based congestion. The
probability of reducing cwnd is zero when the queuing delay is very small,
increasing to a maximum at a set threshold, then back down to zero again when
the queuing delay is high. Normal operation keeps the queuing delay below the
set threshold. However, since loss-based congestion control algorithms push the
queuing delay high when probing for bandwidth, having the probability of
reducing cwnd drop back to zero for high delays allows HD to compete with
loss-based algorithms.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
MFC after:	3 months
@
text
@d3 2
a4 1
SUBDIR=	cc_cubic \
@


1.4
log
@SVN rev 218152 on 2011-02-01 06:17:00Z by lstewart

Import a clean-room implementation of the VEGAS congestion control algorithm
based on the paper "TCP Vegas: end to end congestion avoidance on a global
internet" by Brakmo and Peterson. It is implemented as a kernel module
compatible with the recently committed modular congestion control framework.

VEGAS uses network delay as a congestion indicator and unlike regular loss-based
algorithms, attempts to keep the network operating with stable queuing delays
and no congestion losses. By keeping network buffers used along the path within
a set range, queuing delays are kept low while maintaining high throughput.

In collaboration with:	David Hayes <dahayes at swin edu au> and
				Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	bz and others along the way
MFC after:	3 months
@
text
@d4 1
@


1.3
log
@SVN rev 216115 on 2010-12-02 06:40:21Z by lstewart

Import a clean-room implementation of the experimental H-TCP congestion control
algorithm based on the Internet-Draft "draft-leith-tcp-htcp-06.txt". It is
implemented as a kernel module compatible with the recently committed modular
congestion control framework.

H-TCP was designed to provide increased throughput in fast and long-distance
networks. It attempts to maintain fairness when competing with legacy NewReno
TCP in lower speed scenarios where NewReno is able to operate adequately. The
paper "H-TCP: A framework for congestion control in high-speed and long-distance
networks" provides additional detail.

In collaboration with:	David Hayes <dahayes at swin edu au> and
			Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	rpaulo (older patch from a few weeks ago)
MFC after:	3 months
@
text
@d4 2
a5 1
	cc_htcp
@


1.2
log
@SVN rev 216114 on 2010-12-02 06:05:44Z by lstewart

Import a clean-room implementation of the experimental CUBIC congestion control
algorithm based on the Internet-Draft "draft-rhee-tcpm-cubic-02.txt". It is
implemented as a kernel module compatible with the recently committed modular
congestion control framework.

CUBIC was designed for provide increased throughput in fast and long-distance
networks. It attempts to maintain fairness when competing with legacy NewReno
TCP in lower speed scenarios where NewReno is able to operate adequately. The
paper "CUBIC: A New TCP-Friendly High-Speed TCP Variant" provides additional
detail.

In collaboration with:	David Hayes <dahayes at swin edu au> and
			Grenville Armitage <garmitage at swin edu au>
Sponsored by:	FreeBSD Foundation
Reviewed by:	rpaulo (older patch from a few weeks ago)
MFC after:	3 months
@
text
@d3 2
a4 1
SUBDIR=	cc_cubic
@


1.1
log
@SVN rev 216109 on 2010-12-02 03:10:35Z by lstewart

Add build infrastructure for the forthcoming CC algorithm modules.

Sponsored by:	FreeBSD Foundation
Submitted by:	David Hayes <dahayes at swin edu au>
MFC after:	3 months
@
text
@d3 1
a3 1
SUBDIR=
@

