d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert https://svnweb.freebsd.org/changeset/base/354708

Browse Source 
I used the wrong Differential Revision, so back it out and do it right
in a follow-up commit.
This commit is contained in:
Michael Tuexen 2019-11-16 11:10:09 +00:00
parent 182d1b7133
commit 453e633384
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354771
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/netinet/cc/cc_cubic.c
View File

@ -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,23 +192,6 @@ 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)
{
@ -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);
}