From nobody Tue Jan 16 20:45:53 2024 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 4TF1Hj6700z581Gn; Tue, 16 Jan 2024 20:45:53 +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 4TF1Hj5h99z46pg; Tue, 16 Jan 2024 20:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705437953; 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=0RsAXZGkIJPgRHTHVp5WUGCInz3+1sDRiadN+BPHGCU=; b=qsI+VYEKu/8LbuH76LXIb/j+1NVdbZVeLzBfzQzK3dRpv4IYy/1vgnsVi0tLBA5y013I+t 6TqustH+fDvhcWo1+ODfFoqc1N+W6nRMxW9u/j716X0vroARpcKhqlXlHHSXsVlnZnid8m HPARhbVWNIsXZ1dOjEx01auXhr4B+KpanQtjZNAdW+qQSzYiMBVrmloiehOxEzEqFqeR6F UehEFjHMyAXCFe5/YZ35jvSWMHeZVNNXTKu8IBf6EmzDTIbmhqZfouywrNzKuz31Q0CnMp iVpiUwyXqoGJBlFIGdohd2Sdun9kgLzH3AWFsFEyLY2us+OF2rr5r+kdxedfOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705437953; 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=0RsAXZGkIJPgRHTHVp5WUGCInz3+1sDRiadN+BPHGCU=; b=eElFOaRT2IUXiPcU9AAObskDaAs8Y5J86GwxzEsEvvo5GK1MNeDrOwegxg6JS8TG9YVwMA IrrGxfr2p4HrlpKyWogZGzC9k6VS2i/yj9p7GTwH0jVXJK0kEObpJJXOgAUk5ozAwR5Zu4 6qWXUQCZvhcAaAeiM1KnKlb7+OZR4zvLvvVErzz1QxVLHNoNQM/v4PY26ZNdxD+in9cXcb nFEv1ai+aYzgm6jpWuEvYMcBqbGsn43oR1vj7l0ClP/6yh1bNIm6yqjkjjRo0Di9hdH5CA OZncbXIzmxWJC3DwnqSCTb7nQvNEu+jZLZfapdhVqsGWsU28IWGIVCq+2AfUYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705437953; a=rsa-sha256; cv=none; b=hBhVO5ZWqrKZ60EyMi55kw6qI/pDHIDixe8ZON1jiydOIBmqPW6eIxw/gy5rwe0FJ/WRFm rmGXZ47cw78YoG4ykMzPHWiiiNqL9cEvTbpRJP+TuqoOQnYU4jeDAfsgDTU4gs+wJca3hK UDFi+FZYA8fZqhv4nxpBl6XoB/iw6xxuccA+g6ZNP32Cr+QiqLDuTNwng1Bo10vYMdB3Ed 8nC1Wb4OFcXDsIgLOn542DMZmFOYJHMmJONtA5X4El9ySS42Xgw6CyFxNQmSn+OaIk1Vyw c9gkC7ij+GkbHA3YaDGtvba5QLzbJO8eOsrHTSUSNZUzU3HflreYKjMd9lbjjw== 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 4TF1Hj4knNzvTx; Tue, 16 Jan 2024 20:45:53 +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 40GKjrpX077740; Tue, 16 Jan 2024 20:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GKjrW7077737; Tue, 16 Jan 2024 20:45:53 GMT (envelope-from git) Date: Tue, 16 Jan 2024 20:45:53 GMT Message-Id: <202401162045.40GKjrW7077737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: fcd1b6ec0766 - stable/14 - Compile RACK when options TCP_RACK, not TCP_BBR 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fcd1b6ec0766bbdacc4d1129f88e83c53f929d23 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fcd1b6ec0766bbdacc4d1129f88e83c53f929d23 commit fcd1b6ec0766bbdacc4d1129f88e83c53f929d23 Author: Alex Xu (Hello71) AuthorDate: 2023-11-21 00:09:56 +0000 Commit: Michael Tuexen CommitDate: 2024-01-16 20:42:50 +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 (cherry picked from commit 96f193b290a1aa735ff1833983d654c01ed8902e) --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 31f92670e796..2dbf6f37e940 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4365,7 +4365,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