| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1340118848-30978-11-git-send-email-yuvalmin@broadcom.com> Date: Tue, 19 Jun 2012 18:14:04 +0300 From: "Yuval Mintz" <yuvalmin@...adcom.com> To: netdev@...r.kernel.org, davem@...emloft.net cc: eilong@...adcom.com, "Yuval Mintz" <yuvalmin@...adcom.com>, "Jon Mason" <mason@...i.com>, "Andrew Gallatin" <gallatin@...i.com> Subject: [RFC net-next 10/14] Fix myricom/myri10ge Signed-off-by: Yuval Mintz <yuvalmin@...adcom.com> Signed-off-by: Eilon Greenstein <eilong@...adcom.com> Cc: Jon Mason <mason@...i.com> Cc: Andrew Gallatin <gallatin@...i.com> --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 90153fc..70c132d 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -3775,7 +3775,7 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) mgp->num_slices = 1; msix_cap = pci_find_capability(pdev, PCI_CAP_ID_MSIX); - ncpus = num_online_cpus(); + ncpus = min_t(int, num_online_cpus(), DEFAULT_MAX_NUM_RSS_QUEUES); if (myri10ge_max_slices == 1 || msix_cap == 0 || (myri10ge_max_slices == -1 && ncpus < 2)) -- 1.7.9.rc2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists