Date: Tue, 3 Apr 2018 15:14:31 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331930 - stable/11/sys/netinet/cc Message-ID: <201804031514.w33FEVQH067752@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Apr 3 15:14:30 2018 New Revision: 331930 URL: https://svnweb.freebsd.org/changeset/base/331930 Log: MFC r321587: cc_cubic: restore braces around if-condition block r307901 was reverted in r321480, restoring an incorrect block delimitation bug present in the original cc_cubic commit. Restore only the bugfix (brace addition) from r307901. [HEAD revs above; r307901 and r321480 were both merged to stable/11 in r330445.] CID: 1090182 Reported by: bz Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/netinet/cc/cc_cubic.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/cc/cc_cubic.c ============================================================================== --- stable/11/sys/netinet/cc/cc_cubic.c Tue Apr 3 14:29:56 2018 (r331929) +++ stable/11/sys/netinet/cc/cc_cubic.c Tue Apr 3 15:14:30 2018 (r331930) @@ -261,9 +261,10 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) * chance the first one is a false alarm and may not indicate * congestion. */ - if (CCV(ccv, t_rxtshift) >= 2) + if (CCV(ccv, t_rxtshift) >= 2) { cubic_data->num_cong_events++; cubic_data->t_last_cong = ticks; + } break; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804031514.w33FEVQH067752>