This is conform with the terminology in

  M.Mathis and J.Mahdavi,
  "Forward Acknowledgement: Refining TCP Congestion Control"
  SIGCOMM'96, August 1996.

Submitted by:   Noritoshi Demizu, Raja Mukerji

1 files changed, 3 insertions, 4 deletions

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index c3b562f..cbd4068 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1840,9 +1840,8 @@ trimthenstep6:
 				else if (++tp->t_dupacks > tcprexmtthresh ||
 					 ((tcp_do_newreno || tp->sack_enable) &&
 					  IN_FASTRECOVERY(tp))) {
-
                                         if (tp->sack_enable && IN_FASTRECOVERY(tp)) {
-						int data_in_pipe;
+						int awnd;
 						
 						/*
 						 * Compute the amount of data in flight first.
@@ -1850,9 +1849,9 @@ trimthenstep6:
 						 * we have less than 1/2 the original window's 	
 						 * worth of data in flight.
 						 */
-						data_in_pipe = (tp->snd_nxt - tp->rcv_lastsack) +
+						awnd = (tp->snd_nxt - tp->snd_fack) +
 							tp->sackhint.sack_bytes_rexmit;
-						if (data_in_pipe < tp->snd_ssthresh) {
+						if (awnd < tp->snd_ssthresh) {
 							tp->snd_cwnd += tp->t_maxseg;
 							if (tp->snd_cwnd > tp->snd_ssthresh)
 								tp->snd_cwnd = tp->snd_ssthresh;