svn commit: r238028 - head/sys/dev/cxgbe
Navdeep Parhar
np at FreeBSD.org
Mon Jul 2 20:42:44 UTC 2012
Author: np
Date: Mon Jul 2 20:42:43 2012
New Revision: 238028
URL: http://svn.freebsd.org/changeset/base/238028
Log:
Instruct the firmware not to provision resources for TCP offload if the
kernel is being built without TCP_OFFLOAD. But never override
toecaps_allowed if it has been set manually.
Modified:
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c Mon Jul 2 20:36:54 2012 (r238027)
+++ head/sys/dev/cxgbe/t4_main.c Mon Jul 2 20:42:43 2012 (r238028)
@@ -222,7 +222,7 @@ TUNABLE_INT("hw.cxgbe.linkcaps_allowed",
static int t4_niccaps_allowed = FW_CAPS_CONFIG_NIC;
TUNABLE_INT("hw.cxgbe.niccaps_allowed", &t4_niccaps_allowed);
-static int t4_toecaps_allowed = FW_CAPS_CONFIG_TOE;
+static int t4_toecaps_allowed = -1;
TUNABLE_INT("hw.cxgbe.toecaps_allowed", &t4_toecaps_allowed);
static int t4_rdmacaps_allowed = 0;
@@ -5492,6 +5492,12 @@ tweak_tunables(void)
if (t4_nofldrxq1g < 1)
t4_nofldrxq1g = min(nc, NOFLDRXQ_1G);
+
+ if (t4_toecaps_allowed == -1)
+ t4_toecaps_allowed = FW_CAPS_CONFIG_TOE;
+#else
+ if (t4_toecaps_allowed == -1)
+ t4_toecaps_allowed = 0;
#endif
if (t4_tmr_idx_10g < 0 || t4_tmr_idx_10g >= SGE_NTIMERS)
More information about the svn-src-head
mailing list