diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
commit | 74239ac259519a98f4c32439326afe7e7eb64459 (patch) | |
tree | a3e9a1ae0dc6634e7aa669c8881e425634094257 /drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |
parent | efi/efivar_ssdt_load: Don't return success on allocation failure (diff) | |
parent | Merge tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
download | linux-dev-74239ac259519a98f4c32439326afe7e7eb64459.tar.xz linux-dev-74239ac259519a98f4c32439326afe7e7eb64459.zip |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index f320497368f4..57eb4e1345cb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -4057,7 +4057,7 @@ static void cfg_queues(struct adapter *adap) * capped by the number of available cores. */ if (n10g) { - i = num_online_cpus(); + i = min_t(int, MAX_OFLD_QSETS, num_online_cpus()); s->ofldqsets = roundup(i, adap->params.nports); } else { s->ofldqsets = adap->params.nports; |