Date: Mon, 2 Jul 2012 22:04:09 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r238037 - stable/9/sys/dev/cxgbe Message-ID: <201207022204.q62M491o002503@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Mon Jul 2 22:04:09 2012 New Revision: 238037 URL: http://svn.freebsd.org/changeset/base/238037 Log: MFC r238028: 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: stable/9/sys/dev/cxgbe/t4_main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/9/sys/dev/cxgbe/t4_main.c Mon Jul 2 22:01:29 2012 (r238036) +++ stable/9/sys/dev/cxgbe/t4_main.c Mon Jul 2 22:04:09 2012 (r238037) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207022204.q62M491o002503>