From nobody Tue Jan 16 19:05:11 2024 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 4TDz3X0Kj4z57qjK; Tue, 16 Jan 2024 19:05:12 +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 4TDz3W5mdYz54Ly; Tue, 16 Jan 2024 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431911; 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=m7YxbO/pHSGw4AWW1bYWTYFoArBR46MbHyHtNcRmIic=; b=wpgd8YkMYOgsaSF1l5lmKvdc1SOKMY+Y4b6F/v6eM398Jp+d2AROy3lkO1qr/PC++5z18p l3bnCcwqtVG0FPLVNe+fFWRm675LJCQEPW5MqCDfAWRVrE6DXe71voHdM/v9lBhUnfS06o ZPbKhHKi3Amd7iveuHaXwV4Fh1k+zgI+s3Hj6icIY1giB14jdZOVSN8wSQSF3HJ5/eVAAV 7Art6ox0RwOpORZHv9EoiOK386UVGAL3q6ldq0d8HOi/XcL97Q0+6ZFX6GoNbaH46ry1pI ugIn6Jp/7A2YHSXpRnzZv84DfaUgRmtaINvuOwJdfl9L3Rm7ilGVC3P3jhcXxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431911; 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=m7YxbO/pHSGw4AWW1bYWTYFoArBR46MbHyHtNcRmIic=; b=IUfQ86UdihLFCnhF+ooCYpLqmbyHUxZNDMOVfp/R1rD8kk5GE9I1qNnIeP7ENqaMzcffqV BSS6Vjhz82j6DaomAxo95a/alnjwUb+OFKhh690HAFhvGlM0SHLG9mmoT5h6Amm+rfngfe hvssXX1HL027T368lRHEn5jhKgyRK9ocI8tsT2sjgadnZw79Psx8/1qejxwHYbhVcCp3QY sfC34eSc56Mb/MlXMYkbkZjQl6kQncIKImd8voPVtBw3KB+H+MDFqJ8Zyn8Ph7XB35siWG k3UJlxpXGDKQoR9VMbGdi6uQWEKINvwM+pxHt5K8IyqW3l1U7iQewjPxesEtVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705431911; a=rsa-sha256; cv=none; b=wimTzY7fV4OxFiVnDQTm5IIRmdCNmOUop7J3B3LFPC7EtAjZY3ILXLb1BFNSBqENST5mm4 /XqSK7EJFFPGZKAYm1Ne6BMv97JtWcCNL0P0BGiveCsFAxaxjNDBm6HQHMUtP301hMfNAo FuOcV8YbLlJo6oEtqAfId5pJSWLHwNJD3DR3f6jZK081oaXEu+4GH9UOlpxMAxOlyNuq1C ZguII9CjPNDEQcm6Ys5ZZ2y2Lk7v+rVFSxFYetAQHdAOPQixVZa/zBcaee68hcrrZSPXon g9IcFWBKWXRCQI7aCd6IwS6JUNbwOuc5py/+Ne0KnhJedqBZ2qeIr3knLxdQ4w== 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 4TDz3W4tjQzsLK; Tue, 16 Jan 2024 19:05:11 +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 40GJ5BBU010002; Tue, 16 Jan 2024 19:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GJ5Bhl009999; Tue, 16 Jan 2024 19:05:11 GMT (envelope-from git) Date: Tue, 16 Jan 2024 19:05:11 GMT Message-Id: <202401161905.40GJ5Bhl009999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: fee8f540da32 - stable/14 - hpts: don't ifdef tcp_in_hpts() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: fee8f540da32bc81dbbd81e52382c8aa5b71d678 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fee8f540da32bc81dbbd81e52382c8aa5b71d678 commit fee8f540da32bc81dbbd81e52382c8aa5b71d678 Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-16 18:38:52 +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 (cherry picked from commit 8e907391b74c6ccb6a6925638383e7b82fc9371a) --- 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 083a8b1ea384..c1a29f3d01d7 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4316,9 +4316,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;