From nobody Thu Jan 09 05:29:23 2025 X-Original-To: dev-commits-src-main@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 4YTCyX26Brz5k3FW; Thu, 09 Jan 2025 05:29:24 +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 4YTCyW5hh9z4FR2; Thu, 9 Jan 2025 05:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736400563; 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=VlFSGuhHrZKhhwkX9OsMIE79vU97eXT1pSuR+6FUskI=; b=uyQ3kXHPHfoBTDiMZ95gSt9lgH9Lzya874dDpvou3GeMKHC07ZDfc3bNR1wpwUST4NqGS/ OU2x02NEH6e7vJ4PktmZ7bl0rFEAzi4UMAQkRm5g0mA5QUl1oskMTYEfczQYVLma6tZUVt IZazumXur1EpHL9FJBkVSff+YAiW6NhpVtmnWpZisbsS5FDK+wDgNJLz3KPzXgVjGxwEUQ Ry9blVw2KKST0u5r17gySzAPI/gQrWfqi+2MhE1vB4lLO5VrdcTOk6sH+COf2cF52YHXs1 /CoDgNsiow2633vGFnkSg+ZBHsq6jRHshfw93euHNTHUn/2UoYofNW/ybNg/hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736400563; 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=VlFSGuhHrZKhhwkX9OsMIE79vU97eXT1pSuR+6FUskI=; b=VNfG9JIoLOGKK2u2+zoULcCP9LAnTiU5TxCKimw8v2e5nhY7yrKwyor9OsGAPKBXpdKV8m o86FEvp6l8moeuR4CpCs7X4XP7w8qWFPZOgNjosdUOrNlhVXuOuzmRW74uooX8rnfzQTdz QHF6odHnRl2M24YO5cCqhNiTnNVUIAEniXW+ndzNlVIPMVLhxfOusqM6i/o5n5XWAHbukD I0TCRtQjGjcXFpTgWoeM+b5oDtA7ZcE1ploCjc4i87/ZTtlN8o+ldyZRZEnRqHpXATEoWx WYWDzE84JX+gi0gkOi+O4rEO0yklx0LGv5z7qo2OZEDOmh1wgR/C+QALzbtLyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736400563; a=rsa-sha256; cv=none; b=vpgU7RNVl1Qj+3+F31fciweBGN0uYd0Qb3MRDzAAAFIThi+2T3S3ILAobHA6ihEWABSu2d FpkyjWJsyaEvF0hyDatZD38QR8T6g3af1SAiGWQOCqv2YAA4VApUBAcg0y6dJh+MLDlgNg XOLAG7swvx6pLbxB0c9lzh8JUAkCHaa38Xaz12Ir8nnf3/FOqRd74KQ5yltGuL63aziyeL EqCAH0aE1HroOFtcw1R2foq3ToBMDLPH6b34dUtSW2xxZKAL3UxnRpkkGy2CwTs+ZS2mTc u2u901BdTCEk6FDWPBaOc4j+i9Y+f8k5DqjgfEtEFVu7xob38QuUSiI4GXuqug== 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 4YTCyW53Ctz1RYC; Thu, 09 Jan 2025 05:29:23 +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 5095TNw5081668; Thu, 9 Jan 2025 05:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5095TNqB081665; Thu, 9 Jan 2025 05:29:23 GMT (envelope-from git) Date: Thu, 9 Jan 2025 05:29:23 GMT Message-Id: <202501090529.5095TNqB081665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e7fbf52a3e38 - main - TCP BBR: remove dead code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e7fbf52a3e38c4bc4249e6541fe7e42ecc119656 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e7fbf52a3e38c4bc4249e6541fe7e42ecc119656 commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656 Author: Michael Tuexen AuthorDate: 2025-01-09 05:27:05 +0000 Commit: Michael Tuexen CommitDate: 2025-01-09 05:27:05 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: Peter Lei, rrs (earlier version) CID: 1523802 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48341 --- 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 4600088bd1a1..17a0744961ce 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6781,8 +6781,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); @@ -6823,8 +6821,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);