projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
chelsio
/
cxgb4
/
cxgb4_main.c
diff --git
a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index
f320497
..
57eb4e1
100644
(file)
--- 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;