svn commit: r354771 - head/sys/netinet/cc
Michael Tuexen
tuexen at FreeBSD.org
Sat Nov 16 11:10:10 UTC 2019
Author: tuexen
Date: Sat Nov 16 11:10:09 2019
New Revision: 354771
URL: https://svnweb.freebsd.org/changeset/base/354771
Log:
Revert https://svnweb.freebsd.org/changeset/base/354708
I used the wrong Differential Revision, so back it out and do it right
in a follow-up commit.
Modified:
head/sys/netinet/cc/cc_cubic.c
Modified: head/sys/netinet/cc/cc_cubic.c
==============================================================================
--- head/sys/netinet/cc/cc_cubic.c Sat Nov 16 11:01:56 2019 (r354770)
+++ head/sys/netinet/cc/cc_cubic.c Sat Nov 16 11:10:09 2019 (r354771)
@@ -78,7 +78,6 @@ static int cubic_mod_init(void);
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. */
@@ -113,7 +112,6 @@ struct cc_algo cubic_cc_algo = {
.conn_init = cubic_conn_init,
.mod_init = cubic_mod_init,
.post_recovery = cubic_post_recovery,
- .after_idle = cubic_after_idle,
};
static void
@@ -194,24 +192,7 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type)
}
}
-/*
- * 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)
{
free(ccv->cc_data, M_CUBIC);
@@ -306,6 +287,9 @@ cubic_conn_init(struct cc_var *ccv)
static int
cubic_mod_init(void)
{
+
+ cubic_cc_algo.after_idle = newreno_cc_algo.after_idle;
+
return (0);
}
More information about the svn-src-head
mailing list