From owner-svn-src-head@freebsd.org Sat Nov 16 11:10:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00FBC1C25C4; Sat, 16 Nov 2019 11:10:10 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47FXYs67kFz3KjM; Sat, 16 Nov 2019 11:10:09 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6FE6767; Sat, 16 Nov 2019 11:10:09 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAGBA9ei077022; Sat, 16 Nov 2019 11:10:09 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAGBA9EL077021; Sat, 16 Nov 2019 11:10:09 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201911161110.xAGBA9EL077021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 16 Nov 2019 11:10:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354771 - head/sys/netinet/cc X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet/cc X-SVN-Commit-Revision: 354771 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2019 11:10:10 -0000 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); }