From 34a90e9743ab4444c175633b6522cb76b979c0cd Mon Sep 17 00:00:00 2001 From: Yuval Mintz Date: Sun, 1 Jul 2012 03:18:56 +0000 Subject: [PATCH] --- yaml --- r: 314988 b: refs/heads/master c: 98f2d21f90278856b33e965d1d4bb756754e70f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f149f7011668..46ca4037bd2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5952dde723077e5e0db43cbc9dfb00a4f47c42ef +refs/heads/master: 98f2d21f90278856b33e965d1d4bb756754e70f3 diff --git a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 90153fc983cb..fa85cf1353fd 100644 --- a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/trunk/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 = netif_get_num_default_rss_queues(); if (myri10ge_max_slices == 1 || msix_cap == 0 || (myri10ge_max_slices == -1 && ncpus < 2))