[RFC net-next 04/14] Fix qlogic/qlge
From: Yuval Mintz <hidden>
Date: 2012-06-19 15:16:29
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Signed-off-by: Yuval Mintz <redacted> Signed-off-by: Eilon Greenstein <redacted> Cc: Anirban Chakraborty <redacted> Cc: Jitendra Kalsaria <redacted> Cc: Ron Mercer <redacted> --- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 09d8d33..c6c91de 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c@@ -4646,10 +4646,12 @@ static int __devinit qlge_probe(struct pci_dev *pdev, struct net_device *ndev = NULL; struct ql_adapter *qdev = NULL; static int cards_found = 0; - int err = 0; + int err = 0, ncpu; + + ncpu = min_t(int, num_online_cpus(), DEFAULT_MAX_NUM_RSS_QUEUES); ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), - min(MAX_CPUS, (int)num_online_cpus())); + min(MAX_CPUS, ncpu)); if (!ndev) return -ENOMEM;
--
1.7.9.rc2