D25746.1783816595.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25746.1783816595.diff
View Options

	Index: sys/netinet/cc/cc_cubic.c
	===================================================================
	--- sys/netinet/cc/cc_cubic.c
	+++ sys/netinet/cc/cc_cubic.c
	@@ -145,6 +145,14 @@
	cubic_data->flags \|= CUBICFLAG_IN_SLOWSTART;
	newreno_cc_algo.ack_received(ccv, type);
	} else {
	+ if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART \|
	+ CUBICFLAG_IN_APPLIMIT)) {
	+ cubic_data->flags &= ~(CUBICFLAG_IN_SLOWSTART \|
	+ CUBICFLAG_IN_APPLIMIT);
	+ cubic_data->t_last_cong = ticks;
	+ cubic_data->K = cubic_k(cubic_data->max_cwnd /
	+ CCV(ccv, t_maxseg));
	+ }
	if ((ticks_since_cong =
	ticks - cubic_data->t_last_cong) < 0) {
	/*
	@@ -153,14 +161,6 @@
	ticks_since_cong = INT_MAX;
	cubic_data->t_last_cong = ticks - INT_MAX;
	}
	-
	- if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART \|
	- CUBICFLAG_IN_APPLIMIT)) {
	- cubic_data->flags &= ~(CUBICFLAG_IN_SLOWSTART \|
	- CUBICFLAG_IN_APPLIMIT);
	- cubic_data->t_last_cong = ticks;
	- cubic_data->K = 0;
	- }
	/*
	* The mean RTT is used to best reflect the equations in
	* the I-D. Using min_rtt in the tf_cwnd calculation