From nobody Wed Feb 05 21:03:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YpCQ647RVz5mPHr; Wed, 05 Feb 2025 21:03:42 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCQ63X8Tz3YHw; Wed, 05 Feb 2025 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkN1eqcrLYsKPZEXT+eHxmngM/qrC72apVKk32Gpi3A=; b=J7zGCrrOflk7Z8WeaFMhLj2TL7IEeNeDbiT0Q6y5yCoOhDWE0zfolCMj8+Rcm6cemaKU1R IF0z8vLS0p1fjVKs8NaOhioJ3rQr4RELN6w5sFZSlnkiLIKwq9cfFykshmQ+sgwWB31LlE DpzfFp80OrjvRGy7MrMaebgBVTJ90mvLSXu43UJ5VedDiHTWYaiFQ7/rFEydnjrLWeAAxr grCyXkjfDOQNeOv73IyZjwlIgSJjntytlfaqAeHwW3QBN6qokMWrmkLdxdzv8HbvfCjniR dmmPCF3PLDMO6lbfbgD2U57m7oikOcUiRlbpuq6jwj8wNGJ1NOZAC8F/zZNT4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkN1eqcrLYsKPZEXT+eHxmngM/qrC72apVKk32Gpi3A=; b=RQOjkDaIicnXt2dude5k3sCsqyDadki6VTCy3BMg2CwMNe4CXAoii9SmUpozApdpHz2ffY arkBricc4vw7PSftQfTS22O7ry5TB6/WFY+vRc3/Zqh4h9xvlz2XaMXhiOE9WKGAFZICXS F9nN6wI0I9sR01rKR/YLJGcQeaNYAcilpeji69eLk/dNk0UHGKY87a13ewF3fm8DRb6mA0 zgYKuj4zR3YBaKHk79WrlYkpwajwwGDaQCh4p7kbXQkdLowgExwY/DBq8DWlsZkL1iY8jm dF26Jr6woz8CmRX/LiSQ6KwYbpf0hlhYFkG2Pyc4o1NgScLgwPG7l0qwsBikxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789422; a=rsa-sha256; cv=none; b=SW0WYiY3tnJ1vpA2V/JsVg6qxTmwO7VlhPJ5Nu4/PxcDOvwOtA1lRs7R8DIWjlh/t0nz0p pzvDFDHBYa5YhcSZA0IZ9S6b4jbooyj4ldEfsMT5KFYe74EOFFCsJqcp5LbsiToiT8jKTT PjwL61lXYX159wFRhSyt/Ks6wPh9wM9VBamD04cAo3MVuDqz76SFMCGi76VdIih6hpTNcc VcjTyNJckMd+7DostbYNFBNfVK8FFZvi3h/a4rQA7aiofZJ/LAzz0WKeXDOhcyKQv3FUe2 2hhcnu4sy+MAcDs0Cj3zz33t0BohCC1DhPCEhq2dKavY6uxLbO5W2dmPacsdcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpCQ62y0wz17B8; Wed, 05 Feb 2025 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515L3gT2023532; Wed, 5 Feb 2025 21:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515L3gmK023529; Wed, 5 Feb 2025 21:03:42 GMT (envelope-from git) Date: Wed, 5 Feb 2025 21:03:42 GMT Message-Id: <202502052103.515L3gmK023529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f28415489639 - stable/14 - TCP BBR: remove dead code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f28415489639df69d4bcda74c1199a6b062ab5cf Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f28415489639df69d4bcda74c1199a6b062ab5cf commit f28415489639df69d4bcda74c1199a6b062ab5cf Author: Michael Tuexen AuthorDate: 2025-01-09 05:27:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 10:04:01 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: Peter Lei, rrs (earlier version) CID: 1523802 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48341 (cherry picked from commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index ce13ec9a54a2..66fab54bd010 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6770,8 +6770,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[0]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, 0, BBR_RTT_BY_EXACTMATCH, rsm->r_tim_lastsent[0], ack_type, to); @@ -6812,8 +6810,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[i]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, uts, BBR_RTT_BY_TSMATCHING, rsm->r_tim_lastsent[i], ack_type, to);