git: cbc43d4f1c3d - stable/13 - cxgbe: fix kernel build without TCP_OFFLOAD or RATELIMIT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 11 Nov 2022 01:48:21 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=cbc43d4f1c3d1302ba79e922a77b3ad361d69fe6
commit cbc43d4f1c3d1302ba79e922a77b3ad361d69fe6
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-09-21 09:53:53 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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,