From nobody Tue Nov 21 17:53:57 2023 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 4SZX794S24z5227r; Tue, 21 Nov 2023 17:53:57 +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 4SZX792SxTz4kZ9; Tue, 21 Nov 2023 17:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700589237; 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=jxILAvt051F+E9SXoLuY7RytaX7ONtbPIQMydUjjHPs=; b=L1qMvvzaB8cFfP6pxoxf5gaL3VKvANtZ+SxRsdkWOh1qBvmbGNOj3Zo4vN5Bjt/r4zQo3r u+xfaZau59R0VGaO+l5pSJC1Ud8Ax0/V698nShL31g05YHKXO+XKp/ocnrqJFlz1D1Vg24 UcSL8FJHWbVu10jXxqSFQ14NIb4DqjmoJT1w1LCq40YTeTIu0THdyfQ1sBARlpJI9MJqDC ks4seZ0RpyIqBmKmBrorf5YVK8aTeX9yBSy3PIjVXkhP0n2JZZdQJ/kB0sxagl6xIM6EIi XqVVXuxJlqHYqU99pE5qwKjyeJ8zUN4DeNgN84OpaIOr9wFS0yGVNiNrWF0aUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700589237; 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=jxILAvt051F+E9SXoLuY7RytaX7ONtbPIQMydUjjHPs=; b=f6TtoYP2rrWpE07xxYsi/O6pwGRgWNbqZBWe0MyZM0OcXoJPtha9cgLPl+sFtmKkSYveYg KFq3SRj0AIqV2s4BQuW37LgP/FTWnc38qWhZndyVtPztXN3yO/CYAbM+kHRzBtvCsyFIO/ Fj939V8JrYQ6o7ecU0uwTZsOeN4eWv3BpKvGiX6Go/qmkaIaCoZ0fqj7asNkQvvGbSHCpI GliR9atQbmnqU3oG6voDRXTLD3TbOe/AchMcG/7MqOykdg/lwWR8NpkUH81QkkQ1IWVUiw V21myvxiyW+ge+Aqo3sMx6JYUFSJpN7ate2+FiFl/wyTlCOtoLmWYhjg7sckng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700589237; a=rsa-sha256; cv=none; b=g+XfPzR9KtbSZptk/E/EVvO8jV7oeiIh3u2nX9MI3kmm1bK8RwKvHtSZ5na4WRuPv1YcfQ Nja18MlqbOua0QdqFirl8/rdQyfqTq/xCi/z27R4AMgO8UphB1WslU1reVQK8SFKeRInBL ScmJBp1Xm1ci6j4mnocGc/1F5XBxPm2b2C975QbvF03z0dqM//k0W69CMawAE81uG0UMMn HbWDynGK9BHyLw/4EJKAPa6Jwwxsyhayl7NlKOSkEVtO31eeJuA9aQW5+UYbf84LTMaJvg HALTMkrUD50fFNbkZbQK80YDzwpqOT9G4kSVIwD2vQtAC7BQbKoVGmdNQyv+vg== 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 4SZX791YP5zlV4; Tue, 21 Nov 2023 17:53:57 +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 3ALHrvR5078523; Tue, 21 Nov 2023 17:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALHrvZ0078521; Tue, 21 Nov 2023 17:53:57 GMT (envelope-from git) Date: Tue, 21 Nov 2023 17:53:57 GMT Message-Id: <202311211753.3ALHrvZ0078521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 96f193b290a1 - main - Compile RACK when options TCP_RACK, not TCP_BBR 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96f193b290a1aa735ff1833983d654c01ed8902e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=96f193b290a1aa735ff1833983d654c01ed8902e commit 96f193b290a1aa735ff1833983d654c01ed8902e Author: Alex Xu (Hello71) AuthorDate: 2023-11-21 00:09:56 +0000 Commit: Mitchell Horne CommitDate: 2023-11-21 17:51:10 +0000 Compile RACK when options TCP_RACK, not TCP_BBR Signed-off-by: Alex Xu (Hello71) Fixes: 3a338c5341 ("Add the BBR and RACK stacks to the LINT kernel.") Pull Request: https://github.com/freebsd/freebsd-src/pull/907 --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 1fecda73bf4e..c5cd70415931 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4364,7 +4364,7 @@ netinet/tcp_reass.c optional inet | inet6 netinet/tcp_sack.c optional inet | inet6 netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" -netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ +netinet/tcp_stacks/rack.c optional inet tcp_rack | inet6 tcp_rack \ compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack