From nobody Mon Dec 04 18:59:27 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 4SkXyl4HhZz52h4T; Mon, 4 Dec 2023 18:59:27 +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 4SkXyl3WTXz3TZF; Mon, 4 Dec 2023 18:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716367; 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=gkV1087FFcZvaD+yvmy8Mm3Rtt74kT0WXda511EyuXA=; b=n4e7mTJ3WtE3I4yj9GaTXTYirwV034wumh6mVXVq/OMzD50zRuBonITg8ZbwTYvD4n2eCi lPyreliLAJVZoizw8I0W8q4xELi3ZxWRp/AM/dU8Xz19M58GGGJor8AJimIAFAs6VA/hyb aJDT3ttUZLiMqKsKnhSudn6bycyjht8HTlGDUKKVHCkwEh1GBZ8w8C8Ft3CoBWJZ/w6Olz hm/pBEi5YKJ5ZxJDRNh9Jrc7RblkGe8sqU/pjI/x56VnrmtlYC3e1UCH6c/lg9SyUKoNVK QUUl/3s+rlqFU8gUWqZn0xfaj/nNw2RU98GcZ+1mEdswRhTdEn5dKFLnopvFtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716367; 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=gkV1087FFcZvaD+yvmy8Mm3Rtt74kT0WXda511EyuXA=; b=Mg00bZu3yHOqJ+oErzDxWhJ/hHAUwtOpZgnFH36hrAgTPC1zTilJSTWA7lavq5E8/1zwUI C7VQpT3YGGlxr0mUq9Q4PFrdm40o4tzQ6k6jF2gvpQG/tyCorw6R0boyGlhTq8FMNMvx7i aFpA+6nPYu6/s7R308qzFZhfFZj80Ko91vJmJx1Y6FUVh/0aPtXv0JOAH1Q6Wy2//sx23k qKh6ci+ezDEUM336mzCcgDOYelL8YdRSZDOj2OUIr3gADsDNEqzWv5kB594OIzZImlA2NW YmYjCYZzsVGXyzPhfwcQbY91JqPbkDsV6CCPHTJrwdevK47aoz5X7yni3oTfgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716367; a=rsa-sha256; cv=none; b=ikHuL0hzFxNqvuUjOqZpWK20FeTYlWGqQHybPJXgzYV1PCB+ri40PcL09v2UOR6YT+c5X3 1HNx7eD+1gNWwA86jZz/jjhhccY3nL9t/01RV7J2u4hn2qrjajXHkcp87o9nzlHqSLEiy9 u9SwRouTpTfmZb39Xxhn/Y31RCX04YkmlAAzYdgoVblYKreD0pXw7L1dmBP/iTrsLTvCrg Kcjq6IXc/rULFbAIRgOXRGVCCYyS8uhiVFxUQJP+7Sg+R0mqoSnvVYFWHQLFSF4q2Wj23D k+Xbu78sdCE34DGrjia1yAc/xUFqvtZW2B9VMICtOUYolrwCmgl7EjI95w7NJQ== 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 4SkXyl293czdnS; Mon, 4 Dec 2023 18:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxRmc043542; Mon, 4 Dec 2023 18:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxRBN043539; Mon, 4 Dec 2023 18:59:27 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:27 GMT Message-Id: <202312041859.3B4IxRBN043539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8e907391b74c - main - hpts: don't ifdef tcp_in_hpts() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e907391b74c6ccb6a6925638383e7b82fc9371a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e907391b74c6ccb6a6925638383e7b82fc9371a commit 8e907391b74c6ccb6a6925638383e7b82fc9371a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 hpts: don't ifdef tcp_in_hpts() This small inline function is always available. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42855 --- sys/netinet/tcp_subr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 3354a0bcca39..cfbf32a40d86 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4314,9 +4314,7 @@ tcp_req_log_req_info(struct tcpcb *tp, struct tcp_sendfile_track *req, struct timeval tv; memset(&log.u_bbr, 0, sizeof(log.u_bbr)); -#ifdef TCPHPTS log.u_bbr.inhpts = tcp_in_hpts(tp); -#endif log.u_bbr.flex8 = val; log.u_bbr.rttProp = req->timestamp; log.u_bbr.delRate = req->start;