From nobody Fri May 19 19:54:43 2023 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 4QNHcM5cd6z4CKLS; Fri, 19 May 2023 19:54:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNHcM57LXz3MKd; Fri, 19 May 2023 19:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684526083; 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=ADkhAsuhYMHQkunojhBiDquRCVs8l8rtbNIulaWPnNU=; b=ahRZhN30Wj6RAcsCussMmXKankcEPzXlL77uC71Yzop4sjGbcNnmf+FvlrSNHUO9lAMLi7 I6OEwBb7qXYhp1O1ca0Xzq9jjyUDodpKB05eSX4F0lN+TiVKcivJ9ZfRNxkLmMYaemaN6Q Hst4xjX0Vdzx7dBxmIYy+O9yQl4EMpxbd4n1Ywsj0XCVgYUF4Z+8iDoq/sthsUXXth7p+2 zHlylAlnkulrFCCCx3CxBcvSVa6tPQY2RYlw3b0hk3oleGcRmTtOhCbme8xyNeqZ4p1cpi MSxXOitGUMbG3eM9TeECPNB9XqkSEcCuAsJiVp0xKxhyzAOp43LLNxuvxATLpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684526083; 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=ADkhAsuhYMHQkunojhBiDquRCVs8l8rtbNIulaWPnNU=; b=qZJO5ILIHH+CFdyKVfKQHXb45zLd8wXim2zAjFRxD2MlE36H0KuAyrIM64LN3K7L0k5bfK 9oBBzl4EEl+FtjO50EQh2fXamw1JSBuAPHX91/R51gH5q4+5NhipF2BGT7l2fKfWkrl9he +37g4TP0ydeoCYbBywAACxorSQ48SUtnT+ASZrB77ULrqvfWbNzRM6fGkvDAuvDjdxuya7 hqlCpb9Ov86sx1CNsTYpKEtHaihBC5N6rsLlscAjVI/3Q71P77YI53GH7A9N9R4mdSuC8u GL3/qw8EaSVJJv3yH7bVXMUndpdlqNGbuLs+3CjYJYQt4/8HLf3eZWuMWoBaBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684526083; a=rsa-sha256; cv=none; b=PbclYf/xMD0Y+m5DcUAagx6IVrC7QcdGnO52OAjb8aR6hw1xVGvfnq7cQW+yj2sh9XWZkY ZAfY46EZAW2DHEKC1Mog7bO9rA/JOeRY6A4IXQkyxSC6OVIh9Cz6YrFiHBwFR35ADID+wO 98Ikxo4RVSQA+TqyVJ7NEFoFiNJVxV6ntt8ayO2sLmCrt/RyG4fJgSTGjSlVqvDWo2Nuf1 HY2QlbffymUIF3aTMH9Id+kz8GFTey+t73F7PU4bczRU+zGoT40lTr8/FlBzCBCT7m4qCI Z1eCEKDGKCnE1eWgpKEeg4OGgfKihhQLnGou+I71K04OcD8X4XCqvtnGQzLGvg== 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 4QNHcM4444zhBp; Fri, 19 May 2023 19:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34JJsh7N067969; Fri, 19 May 2023 19:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JJshTN067968; Fri, 19 May 2023 19:54:43 GMT (envelope-from git) Date: Fri, 19 May 2023 19:54:43 GMT Message-Id: <202305191954.34JJshTN067968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 72ae93825244 - main - Add a comment to the new tcp_get_srtt method to clarify that ticks are kept in a shifted form and need to be un-shifted before use. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ae938252446ce6c716cb51e3f27737b137900e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=72ae938252446ce6c716cb51e3f27737b137900e commit 72ae938252446ce6c716cb51e3f27737b137900e Author: Randall Stewart AuthorDate: 2023-05-19 19:53:26 +0000 Commit: Randall Stewart CommitDate: 2023-05-19 19:53:26 +0000 Add a comment to the new tcp_get_srtt method to clarify that ticks are kept in a shifted form and need to be un-shifted before use. Suggested by: rpokala@ --- sys/netinet/tcp_subr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index db0b3b76088e..7e156bcd5355 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4649,8 +4649,10 @@ tcp_get_srtt(struct tcpcb *tp, int granularity) if (tp->t_tmr_granularity == TCP_TMR_GRANULARITY_USEC) srtt = tp->t_srtt; - else if (tp->t_tmr_granularity == TCP_TMR_GRANULARITY_TICKS) + else if (tp->t_tmr_granularity == TCP_TMR_GRANULARITY_TICKS) { + /* TICKS are stored shifted; unshift for the real TICKS */ srtt = tp->t_srtt >> TCP_RTT_SHIFT; + } if (tp->t_tmr_granularity == granularity) return (srtt); /* If we reach here they are oppsite what the caller wants */