From nobody Wed Feb 5 21:04:14 2025 X-Original-To: dev-commits-src-all@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 4YpCQl13vVz5mPfR; Wed, 05 Feb 2025 21:04:15 +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 4YpCQl06rXz3Yjn; Wed, 05 Feb 2025 21:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789455; 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=iDheeTJO4zX7qN20qrQLQuBOPlexROTqJs6H4LHBuHk=; b=DpY6B3OXsaceTxv5PeGCL2h57xaaC1ULkycF6yzOkhB453/PLbti9IS4FgegOjm+4As0HD 69XBOZr7KHSPHA80WE4VCDe0q94Neee2efMwxHB4iJJ81uK0Gk7G7eW9VGY/ecDcEDPKi5 Z+jfhgXRH0ucXwEqYXzIZsCEhyiUQivjkq7w7Rv2YZAY3HRFV/X5Q7PQwrH4vQckbPy29V E9t+lX6RMSlf5fpPntGMx4bhyBF+kfz6To5QBBKm/MTtgqjgpbC2WpB1NmpRWPdp90HR1u vP7ScTJclVbqyt0BhOA/sJN+xfW9UtOWK0jZlPs7kH7wEVbwhGYunpbwOYXy0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789455; 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=iDheeTJO4zX7qN20qrQLQuBOPlexROTqJs6H4LHBuHk=; b=T/5A9PqjHcYLF3FMI17dKlWGJv+v//oarorXeONrvSosdUboXRHOXfbdlLetoLy+zT2sYD 49fost+cm63oTMkqIvCU7NFCbb8NEv5QKjdqpW9yVj1PoZ1WkPVG2HCLoPj2gIy1Ez+DR1 cMyf1SDZK8T7AlatgxNFR06HJ3iInSc2b0/U+auV8oghp2AoG/K77zmyyR2bqkQ4fnB9Yr gca7qJqOvhqdpsXMzTjZNjVlerrqIWa6OAjQ9wWUgf7adYaATotAr4CTMd2byG4mlo9F/S z26HvrsCaC900mLSCISqy/PvpMguwAbNpl1qhf2rU+N5GHaQf2P8RcdPSOT2oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789455; a=rsa-sha256; cv=none; b=O/vAWHKQJuQrCMukWHAMo+XIyAIKskeWc0i0aQ7Ax8ihV4l448Td92uJnoh3xtx3G+j3Vq 61EWniDdm2t55CcLWuUUST76/4HOlfeEn/xdfRNpv842ZSqrRrnSO838EskYMIBsFZfrx0 rSmZqJtbeCYrzhtgJVV6YBzJi80HSwsRXSmV9QMARTzmyqV45nKLEaJmPGwJAKssNpQN0H ZHXY9/w+ATJLFgkN8rvy75eoUK4PnybQdgVOrK/udkjz5ZlnFf8cyhAWwC7/A9Gpkp1yGp rS4WDGKD8olvuhDxH4GzWi5FLq9ri2AkOsksZb8N/pfwdQc56RQZhDzG371Vyg== 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 4YpCQk6gDLz16x5; Wed, 05 Feb 2025 21:04:14 +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 515L4EaV023815; Wed, 5 Feb 2025 21:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515L4EeS023812; Wed, 5 Feb 2025 21:04:14 GMT (envelope-from git) Date: Wed, 5 Feb 2025 21:04:14 GMT Message-Id: <202502052104.515L4EeS023812@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: dc66be9b6258 - stable/13 - TCP BBR: remove dead code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: dc66be9b625829dde2972a16e65af4424a1f629f Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dc66be9b625829dde2972a16e65af4424a1f629f commit dc66be9b625829dde2972a16e65af4424a1f629f Author: Michael Tuexen AuthorDate: 2025-01-09 05:27:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:49:29 +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 7193978f4ff0..32ee306f633e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6814,8 +6814,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); @@ -6856,8 +6854,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);