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

[Hiren Panchasara]

Author: hiren
Date: Wed Dec  9 07:56:40 2015
New Revision: 292011
URL: https://svnweb.freebsd.org/changeset/base/292011

Log:
  Add an option to use rfc6675 based pipe/inflight bytes calculation in cubic.
  
  Reviewed by:		gnn
  MFC after:		3 weeks
  Sponsored by:		Limelight Networks
  Differential Revision:	https://reviews.freebsd.org/D4205

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

Modified: head/sys/netinet/cc/cc_cubic.c
==============================================================================
--- head/sys/netinet/cc/cc_cubic.c	Wed Dec  9 06:59:04 2015	(r292010)
+++ head/sys/netinet/cc/cc_cubic.c	Wed Dec  9 07:56:40 2015	(r292011)
@@ -299,8 +299,10 @@ static void
 cubic_post_recovery(struct cc_var *ccv)
 {
 	struct cubic *cubic_data;
+	int pipe;
 
 	cubic_data = ccv->cc_data;
+	pipe = 0;
 
 	/* Fast convergence heuristic. */
 	if (cubic_data->max_cwnd < cubic_data->prev_max_cwnd)
@@ -315,10 +317,13 @@ cubic_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
 			/* Update cwnd based on beta and adjusted max_cwnd. */
 			CCV(ccv, snd_cwnd) = max(1, ((CUBIC_BETA *