From af8d37f324d300e93e33168c2866cb46fda796e1 Mon Sep 17 00:00:00 2001 From: Yuval Mintz Date: Sun, 1 Jul 2012 03:18:55 +0000 Subject: [PATCH] --- yaml --- r: 314987 b: refs/heads/master c: 5952dde723077e5e0db43cbc9dfb00a4f47c42ef h: refs/heads/master i: 314985: 24eb5e907f6d6f946da15da4ce88a7f3ec8c4846 314983: 65cd4961c9df2ac872dcbffc754621cbfd7cf610 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c7de758a9f94..f149f7011668 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbfa600148a25903976910863c75dae185f8d187 +refs/heads/master: 5952dde723077e5e0db43cbc9dfb00a4f47c42ef diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/trunk/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index e1f96fbb48c1..5ed49af23d6a 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -3493,8 +3493,8 @@ static void __devinit cfg_queues(struct adapter *adap) */ if (n10g) q10g = (MAX_ETH_QSETS - (adap->params.nports - n10g)) / n10g; - if (q10g > num_online_cpus()) - q10g = num_online_cpus(); + if (q10g > netif_get_num_default_rss_queues()) + q10g = netif_get_num_default_rss_queues(); for_each_port(adap, i) { struct port_info *pi = adap2pinfo(adap, i);