svn commit: r292012 - head/sys/netinet/cc

[Hiren Panchasara]

Author: hiren
Date: Wed Dec  9 08:53:41 2015
New Revision: 292012
URL: https://svnweb.freebsd.org/changeset/base/292012

Log:
  Add an option to use rfc6675 based pipe/inflight bytes calculation in newreno.
  
  MFC after:	    3 weeks
  Sponsored by:	    Limelight Networks

Modified:
  head/sys/netinet/cc/cc_newreno.c

Modified: head/sys/netinet/cc/cc_newreno.c
==============================================================================
--- head/sys/netinet/cc/cc_newreno.c	Wed Dec  9 07:56:40 2015	(r292011)
+++ head/sys/netinet/cc/cc_newreno.c	Wed Dec  9 08:53:41 2015	(r292012)
@@ -214,6 +214,9 @@ newreno_cong_signal(struct cc_var *ccv, 
 static void
 newreno_post_recovery(struct cc_var *ccv)
 {
+	int pipe;
+	pipe = 0;
+
 	if (IN_FASTRECOVERY(CCV(ccv, t_flags))) {
 		/*
 		 * Fast recovery will conclude after returning from this
@@ -224,10 +227,13 @@ newreno_post_recovery(struct cc_var *ccv
 		 *
 		 * XXXLAS: Find a way to do this without needing curack
 		 */
-		if (SEQ_GT(ccv->curack + CCV(ccv, snd_ssthresh),
-		    CCV(ccv, snd_max)))
-			CCV(ccv, snd_cwnd) = CCV(ccv, snd_max) -
-			ccv->curack + CCV(ccv, t_maxseg);
+		if (V_tcp_do_rfc6675_pipe)
+			pipe = tcp_compute_pipe(ccv->ccvc.tcp);
+		else
+			pipe = CCV(ccv, snd_max) - ccv->curack;
+
+		if (pipe < CCV(ccv, snd_ssthresh))
+			CCV(ccv, snd_cwnd) = pipe + CCV(ccv, t_maxseg);
 		else
 			CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
 	}