From owner-p4-projects@FreeBSD.ORG  Tue May  5 07:33:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEB43106566C; Tue,  5 May 2009 07:33:36 +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 AEC06106564A
	for <perforce@freebsd.org>; Tue,  5 May 2009 07:33:36 +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 9DAA98FC0A
	for <perforce@freebsd.org>; Tue,  5 May 2009 07:33:36 +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 n457Xagk003931
	for <perforce@freebsd.org>; Tue, 5 May 2009 07:33:36 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n457XauA003929
	for perforce@freebsd.org; Tue, 5 May 2009 07:33:36 GMT
	(envelope-from andre@freebsd.org)
Date: Tue, 5 May 2009 07:33:36 GMT
Message-Id: <200905050733.n457XauA003929@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 161599 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: Tue, 05 May 2009 07:33:38 -0000

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

Change 161599 by andre@andre_t61 on 2009/05/05 07:32:53

	Various WIP.

Affected files ...

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

Differences ...

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

@@ -144,7 +144,8 @@
 #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 */
+#define	TP_RETRY	6		/* retry after ENOMEM or ENOBUF */
+#define	TP_URGENT	7		/* urgent mode */
 
 	int	t_softerror;		/* possible error not yet reported */
 
@@ -159,6 +160,7 @@
 	tcp_seq	snd_nxt;		/* send next */
 	tcp_seq	snd_rxmt;		/* from where to retransmit */
 	tcp_seq snd_inflight;		/* estimate of data currently in the network (~SACK) */
+	u_int	snd_maxburst;		/* maximum send burst length */
 
 	tcp_seq	snd_up;			/* send urgent pointer */
 
@@ -240,21 +242,12 @@
 	int	snd_sacked;		/* data currently ack'ed through SACK */
 
 /* Congestion control algorithms */
-	union {
-	    struct tcc_newreno {
-		tcp_win	xxx;
-	    } tc_newreno;
-	    struct tcc_vegas {
-		tcp_win xxx;
-	    }
-	int	t_dupacks;		/* consecutive dup acks recd */
 	tcp_seq	snd_recover;		/* for use in NewReno Fast Recovery */
 	tcp_win	snd_cwnd_prev;		/* cwnd prior to retransmit */
 	tcp_win	snd_ssthresh_prev;	/* ssthresh prior to retransmit */
 	tcp_seq	snd_recover_prev;	/* snd_recover prior to retransmit */
 	tcp_win	t_badrxtwin;		/* window for retransmit recovery */
 	int	snd_limited;		/* segments limited transmitted */
-	} t_congest;
 };
 
 /*