From nobody Fri Nov 11 01:48:21 2022 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 4N7hS60xYqz4f47M; Fri, 11 Nov 2022 01:48:22 +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 4N7hS55nVXz3KcQ; Fri, 11 Nov 2022 01:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668131301; 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=QhqhUWaCFJGccSaRhnkumJlr7jt+YOH6GOkKaQzoBtU=; b=cY1CDW4tf/xFZPwYozrnHtTA3xtAdqHFd6AIMxK5EgYFvxHKAOzrP3IbrtWyIORoz1goT7 LbIDKM/Mgm9u8PyFyBuOT6x2bRxUC2scRMXTK5Is3xtuXSXsLU1wNxfM+hEEt7oQfRkzxa IEHMBAoB7zTcZ3hd8Gl+Ve0QiXgWlqElDPxW46g6oXqZes0QtSiFiAUEwf2fms/IjSF4FY u47NgtK6GkslJBlxos1uvGRyzwhes+1PWY1i6fDt4PsFqqTezJ/M7Nn0IGuId5y4vyei9N bqdvPxB/xh0LeEQ87BXJGcOahjkWHSW8/TiXh4ZLOkAraXN1GuD9XiqTFzuA0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668131301; 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=QhqhUWaCFJGccSaRhnkumJlr7jt+YOH6GOkKaQzoBtU=; b=GmKxbD+MX6O5ZAlqnlY3q+JLDBEUiGtNObpUUQXA3F+0C018poFM+1Paj1HpSMiHAYBtxo LcRrGfreYF+3nKPCMVmyQ27FXIx38UVHwUjt/LoGVMjN/9VPK8tl23FRAqMsFH16X26Kpu TI0ngB9uT+WBQXKUKi6HurX/Atr7wweoK9IWJWe9wjG/6TvcZF2ygfojwb8NX9h3bAW7au IZ0Nlp8F1BOofczgIK/H87vI5Xh/rWvRk39W14aa/4KeatLuR2hV/Rs+dfoXXWgAdLAqFf VijQQu0BjeVb7sbOWEfbDGf9omS5YhR2hDc7lBKVsatzJpmyu7DPa5aWtgpORQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668131301; a=rsa-sha256; cv=none; b=DlA4nQWh2B2K0vkaVASJy+MlKLozb/fuv5FDZsPX8qePYW2COClzRYTpgmCQka9ZNNJa5S stg1AnsuopKO/X+HEs0Y0XsSZjlSnUcDuWqJvNxJlSg6S6JPMQzX2lA3oYb4VWNUtSDhWM FR4pcHtKRV/J7T6ZFDVZzbEPV66ee77QaJ2V5+fM7Cjfyu2UpzW1lLMGDuiSbhQ6xs7Tg4 FLpveF43tkksp0XZM9WPM0onwVlLMjt1CRGNtg/4VA3azi401nxaHZe3yhZ9Sq5d9tEqxa uAkEkXBPaenTlp9u37D+9YuZD8JPvVvzfqPR2TTafbapjHC/af5NtK5z+Prwww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7hS54dntzNVY; Fri, 11 Nov 2022 01:48:21 +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 2AB1mLLB056480; Fri, 11 Nov 2022 01:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AB1mL8F056479; Fri, 11 Nov 2022 01:48:21 GMT (envelope-from git) Date: Fri, 11 Nov 2022 01:48:21 GMT Message-Id: <202211110148.2AB1mL8F056479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cbc43d4f1c3d - stable/13 - cxgbe: fix kernel build without TCP_OFFLOAD or RATELIMIT 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cbc43d4f1c3d1302ba79e922a77b3ad361d69fe6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc43d4f1c3d1302ba79e922a77b3ad361d69fe6 commit cbc43d4f1c3d1302ba79e922a77b3ad361d69fe6 Author: Konstantin Belousov AuthorDate: 2022-09-21 09:53:53 +0000 Commit: John Baldwin CommitDate: 2022-11-11 01:26:05 +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 (cherry picked from commit 8d42019058ac96dbd8955ac28bb3dbc722587226) --- 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 e06a3cf807a3..9ac790abfcf4 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -319,12 +319,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"); @@ -337,6 +331,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,