D18954.id53243.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18954.id53243.diff
View Options

	Index: sys/netinet/cc/cc_cubic.c
	===================================================================
	--- sys/netinet/cc/cc_cubic.c
	+++ sys/netinet/cc/cc_cubic.c
	@@ -78,6 +78,7 @@
	static void cubic_post_recovery(struct cc_var *ccv);
	static void cubic_record_rtt(struct cc_var *ccv);
	static void cubic_ssthresh_update(struct cc_var *ccv);
	+static void cubic_after_idle(struct cc_var *ccv);

	struct cubic {
	/* Cubic K in fixed point form with CUBIC_SHIFT worth of precision. */
	@@ -112,6 +113,7 @@
	.conn_init = cubic_conn_init,
	.mod_init = cubic_mod_init,
	.post_recovery = cubic_post_recovery,
	+ .after_idle = cubic_after_idle,
	};

	static void
	@@ -162,7 +164,8 @@
	* TCP-friendly region, follow tf
	* cwnd growth.
	*/
	- CCV(ccv, snd_cwnd) = w_tf;
	+ if (CCV(ccv, snd_cwnd) < w_tf)
	+ CCV(ccv, snd_cwnd) = w_tf;

	else if (CCV(ccv, snd_cwnd) < w_cubic_next) {
	/*
	@@ -192,6 +195,23 @@
	}
	}

	+/*
	+ * This is a Cubic specific implementation of after_idle.
	+ * - Reset cwnd by calling New Reno implementation of after_idle.
	+ * - Reset t_last_cong.
	+ */
	+static void
	+cubic_after_idle(struct cc_var *ccv)
	+{
	+ struct cubic *cubic_data;
	+
	+ cubic_data = ccv->cc_data;
	+
	+ newreno_cc_algo.after_idle(ccv);
	+ cubic_data->t_last_cong = ticks;
	+}
	+
	+
	static void
	cubic_cb_destroy(struct cc_var *ccv)
	{
	@@ -287,9 +307,6 @@
	static int
	cubic_mod_init(void)
	{
	-
	- cubic_cc_algo.after_idle = newreno_cc_algo.after_idle;
	-
	return (0);
	}