From nobody Wed Sep 21 16:21:46 2022 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 4MXkFR1MLXz4cvFp; Wed, 21 Sep 2022 16:21:47 +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 4MXkFR0vcsz3Lvm; Wed, 21 Sep 2022 16:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663777307; 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=o4yhWZ25UwoDcGF/WBXNoLHP1T1qEBzhd3jRMvjrOuw=; b=cUFwDKNIabTLKkeoEUG3RcYAI8pLwWQiSYmac7rbVw6/RwNFUyBZfvTNfsut1I2lMBSzeO J6bPJFZZtRB0NpgGRuu+XrlzGooNe5528GNR4edASQGb7u71fgqVu14B+Y1Kqb5rjFdLv4 oEeWlz07X4meU0bYklqh4xxCdqlSBGm8ExvwEkGcThH4uE6F5Yt3qa7pfE6UAwVlt3Tsaw OyJhLhE834oD0fwz4et7OpLNyi3C8ewtqXKG+YSmBIJA3LdF93nmo4pk+16vRo18qYYydw 2LXWd0PahmJdn7UbrQh2c4UagtY/KNoRlrPoLkIiYSY1FkCDiLP6aODTxXituw== 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 4MXkFR00YTz16jm; Wed, 21 Sep 2022 16:21:47 +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 28LGLkTk074963; Wed, 21 Sep 2022 16:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LGLkkR074962; Wed, 21 Sep 2022 16:21:46 GMT (envelope-from git) Date: Wed, 21 Sep 2022 16:21:46 GMT Message-Id: <202209211621.28LGLkkR074962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8d42019058ac - main - cxgbe: fix kernel build without TCP_OFFLOAD or RATELIMIT 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d42019058ac96dbd8955ac28bb3dbc722587226 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663777307; 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=o4yhWZ25UwoDcGF/WBXNoLHP1T1qEBzhd3jRMvjrOuw=; b=w5W00NwLYdw2mGRnzgngZ8nwnmi9+y/1jBg+okLPqGPZ488gvGzEK83BWhzh06f4wQtLcf 7hvxLIEYs2FCwtqssZN1wMzVeCDpEOCvIdBWZgxCOFkorP34jkNiv8IQeQ36v0AS6Tc04D x3aYQMX9GQwJVuYmmnyidkfjCH05nU5nrs+xM8LcQxSJAlk0GOvJ//SftLyaTbniqGTfMU VkFmrKWFYtM73px9rZNupMldq8Q6hfOdsQM0f4izKZYrh6UYmtDbBX7rnKsKiMPvFCDHxY AsxMEpJuTQH0R374VdDtBGOUlmz+OCVAj3bK+w5HXFz0Pxvx5H5hZw6yAA4sOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663777307; a=rsa-sha256; cv=none; b=loeN8Fke9WNxti+H9ClnOF4IT3dqEr4/nuku5BE+TewsLuM7+9Gv+sUFKFqRAdv7CnBABI UV45OibqyAUXM8TX8WuGLXsLr58E7LOEZFCTV0U7ani+oM2q/vTvNwX6rYLDA3z7B7eLEz R9O6SCtLLp4TSCbGKppBtpT7iBWhbdYlrba7IBEXAJk3i94wrciV6eRy5EcoaowtMDEKK9 ESG0tLK4wMTtvk1PQq+xsc+DzsETCytyOHP48Z5oNNa+fzOTc4vk/39tCqvtutXi4RYJfk LX7Jds40IWBu4uDanugEC/5xLLoG+f80dqKYnp8GvAFWXONf+U+5kNAQmileKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8d42019058ac96dbd8955ac28bb3dbc722587226 commit 8d42019058ac96dbd8955ac28bb3dbc722587226 Author: Konstantin Belousov AuthorDate: 2022-09-21 09:53:53 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-21 16:19:28 +0000 cxgbe: fix kernel build without TCP_OFFLOAD or RATELIMIT Reviewed by: np Fixes: e398922eaf6 Sponsored by: Nvidia networking Differential revision: https://reviews.freebsd.org/D36648 --- sys/dev/cxgbe/t4_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index fd3079b700b5..6547d199ca02 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -314,12 +314,6 @@ static int t4_rsrv_noflowq = 0; SYSCTL_INT(_hw_cxgbe, OID_AUTO, rsrv_noflowq, CTLFLAG_RDTUN, &t4_rsrv_noflowq, 0, "Reserve TX queue 0 of each VI for non-flowid packets"); -#if defined(TCP_OFFLOAD) || defined(RATELIMIT) -#define NOFLDTXQ 8 -static int t4_nofldtxq = -NOFLDTXQ; -SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldtxq, CTLFLAG_RDTUN, &t4_nofldtxq, 0, - "Number of offload TX queues per port"); - static int t4_clocksync_fast = 1; SYSCTL_INT(_hw_cxgbe, OID_AUTO, csfast, CTLFLAG_RW | CTLFLAG_MPSAFE, &t4_clocksync_fast, 0, "During initial clock sync how fast do we update in seconds"); @@ -332,6 +326,12 @@ static int t4_fast_2_normal = 30; SYSCTL_INT(_hw_cxgbe, OID_AUTO, cscount, CTLFLAG_RW | CTLFLAG_MPSAFE, &t4_fast_2_normal, 0, "How many clock syncs do we need to do to transition to slow"); +#if defined(TCP_OFFLOAD) || defined(RATELIMIT) +#define NOFLDTXQ 8 +static int t4_nofldtxq = -NOFLDTXQ; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldtxq, CTLFLAG_RDTUN, &t4_nofldtxq, 0, + "Number of offload TX queues per port"); + #define NOFLDRXQ 2 static int t4_nofldrxq = -NOFLDRXQ; SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldrxq, CTLFLAG_RDTUN, &t4_nofldrxq, 0,