From owner-p4-projects@FreeBSD.ORG  Sun Mar 22 22:05:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 990AD106574A; Sun, 22 Mar 2009 22:05:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54B251065747
	for <perforce@freebsd.org>; Sun, 22 Mar 2009 22:05:38 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 42B998FC13
	for <perforce@freebsd.org>; Sun, 22 Mar 2009 22:05:38 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2MM5bQK031180
	for <perforce@freebsd.org>; Sun, 22 Mar 2009 22:05:37 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2MM5bIa031178
	for perforce@freebsd.org; Sun, 22 Mar 2009 22:05:37 GMT
	(envelope-from andre@freebsd.org)
Date: Sun, 22 Mar 2009 22:05:37 GMT
Message-Id: <200903222205.n2MM5bIa031178@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 159638 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2009 22:05:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=159638

Change 159638 by andre@andre_t61 on 2009/03/22 22:04:51

	Split the states the TCP sender can be in into clearly distinct phases
	to simplify the logic all over the place.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_var.h#5 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_var.h#5 (text+ko) ====

@@ -137,9 +137,14 @@
 
 #define	TF_TSO		0x1000000	/* TSO enabled on this connection */
 
-	u_int	t_cflags;		/* congestion control flags */
-#define	TF_FASTRECOVERY	0x0100000	/* in NewReno Fast Recovery */
-#define	TF_WASFRECOVERY	0x0200000	/* was in NewReno Fast Recovery */
+	u_int	t_phase;		/* send phase we are currently in */
+#define	TP_IDLE		0		/* nothing to send */
+#define	TP_SLOWSTART	1		/* slow start */
+#define	TP_CONGAVOID	2		/* congestion avoidance */
+#define	TP_LOSSRECOV	3		/* loss recovery */
+#define	TP_LOSSREXMT	4		/* loss recovery failed, retransmit */
+#define	TP_PERSIST	5		/* persistent mode */
+#define	TP_URGENT	6		/* urgent mode */
 
 	int	t_softerror;		/* possible error not yet reported */