PERFORCE change 161599 for review

[Andre Oppermann]

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

Change 161599 by andre at 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;
 };
 
 /*