From nobody Sat May 06 09:04:54 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 4QD1pb15rZz49KT5; Sat, 6 May 2023 09:04:55 +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 4QD1pb0Jnbz3nvX; Sat, 6 May 2023 09:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683363895; 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=5oox4J7YOPGsDYTGByXjCZqgH3WcH2c28M2lGVK88no=; b=ZBjrE5DG/UAbmVwbfQqp5BGdk8agnJ/63mU06IwEkum6c2UA8zQdAYHR5GbhALqgCxnV7T iCOK0pY14Tu2M9Ux+wKxYigX71qZ980iWSnWjpz/AOZJiL2WoQpeXP0+z9utbRCB4rNWGj Pv+H9sL9bx1DECxWiH6/Hbg1HF1W6/HIkpsADs59ZeUVu19KYCwWCRAmmDDa5U7tmZeZzn OSd4nR/6YUZbxMsncak//PHP4H8+rRHxhsekRb2ddc0yBUGB1ZJ2dkt1EZbhkCoxRi/uGi qslWgERqdRjZrd25pK5OSoW18RESf5My1dKLYgDcO6nwfmsv2CuNoDTdf/4dtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683363895; 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=5oox4J7YOPGsDYTGByXjCZqgH3WcH2c28M2lGVK88no=; b=lBXnpxp3TrsZ9M9lEvKygFQZvbDs2ELO2EFa8ZSkdDl9WFSXLNQQ6ckKd1g04QXyRI8Q4H YQZPdnT8RYZaNr/0dS9WtWu81RoIC37jHfxGB7V3fV0mwhfH1xIttnz59NaUC6ItufS1JI xnOUHMKD+2Kt25UPmn58npWaIC9yZx+KviSnI6xPIuS3SPH7QW535PPtrrdNhKv+wKHvjZ +kSnpeHQgbGsarpixzhjJus6rXZYH2r7m378/osJufIuJpa7ZyeH4Bj+43+BAuKliawF1+ UkOqeYrC31CDg9iwdQfXb5Zw0Ba5uwlhCwyE28mrf1k7utJGcdIBIh4XVtw4Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683363895; a=rsa-sha256; cv=none; b=sKdAmrROe+IU9Cw6mrdO1XMlqTn8Ob3mGPglsUj7RMg3fHOlrAsvrMpdXDZkYvVDDOTUor DsJKT7LeHJyPRsPwpOw3s+2PVOWbJkrTnRrYmlqw4AKbSpaw3TCmbDdh68DkP67P1nNZFj mTvp9TiR7B2iVfzrsT6sw+96OrqknCGSN++FGykfiu70ATfDTWuPnGzffDYTkilACns70w y6YOtqCMOLy0KJkoQ38V/TBzUooAn0UnNyUkk12sL9iBTHnvtruluEobd7o0gRTr4MuErJ yLSPthPwJx+J09OUeXevoMlJP2D3ByJ2cjnzr5oRS76b1wScEGrgPL6y8XrYVQ== 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 4QD1pZ6VPvzWW1; Sat, 6 May 2023 09:04:54 +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 34694s0o061640; Sat, 6 May 2023 09:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34694sc7061639; Sat, 6 May 2023 09:04:54 GMT (envelope-from git) Date: Sat, 6 May 2023 09:04:54 GMT Message-Id: <202305060904.34694sc7061639@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: 113f56ba4930 - main - tcp_rack: allow the module to be loaded without TCP_BLACKBOX 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 113f56ba493037c752da15ed20eae18c9103ffa6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=113f56ba493037c752da15ed20eae18c9103ffa6 commit 113f56ba493037c752da15ed20eae18c9103ffa6 Author: Michael Tuexen AuthorDate: 2023-05-06 09:02:50 +0000 Commit: Michael Tuexen CommitDate: 2023-05-06 09:02:50 +0000 tcp_rack: allow the module to be loaded without TCP_BLACKBOX PR: 271091 Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39860 --- sys/netinet/tcp_log_buf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 4507507e5f63..11c4c25a3727 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -447,6 +447,7 @@ tcp_get_bblog_state(struct tcpcb *tp) static inline void tcp_trace_point(struct tcpcb *tp, int num) { +#ifdef TCP_BLACKBOX if (((tcp_trace_point_config == num) || (tcp_trace_point_config == 0xffffffff)) && (tcp_trace_point_bb_mode != 0) && @@ -461,6 +462,7 @@ tcp_trace_point(struct tcpcb *tp, int num) tcp_trace_point_count = 0; } } +#endif } #define TCP_LOG_BUF_DEFAULT_SESSION_LIMIT 5000