From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yuval Mintz" Subject: [RFC net-next 05/14] Fix intel/ixgbevf Date: Tue, 19 Jun 2012 18:13:59 +0300 Message-ID: <1340118848-30978-6-git-send-email-yuvalmin@broadcom.com> References: <1340118848-30978-1-git-send-email-yuvalmin@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: eilong@broadcom.com, "Yuval Mintz" , "Jeff Kirsher" To: netdev@vger.kernel.org, davem@davemloft.net Return-path: Received: from mms3.broadcom.com ([216.31.210.19]:2600 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006Ab2FSPQe (ORCPT ); Tue, 19 Jun 2012 11:16:34 -0400 In-Reply-To: <1340118848-30978-1-git-send-email-yuvalmin@broadcom.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Yuval Mintz Signed-off-by: Eilon Greenstein Cc: Jeff Kirsher --- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index f69ec42..3ad46c2 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2014,7 +2014,7 @@ err_tx_ring_allocation: static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter) { int err = 0; - int vector, v_budget; + int vector, v_budget, ncpu; /* * It's easy to be greedy for MSI-X vectors, but it really @@ -2022,8 +2022,9 @@ static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter) * than CPU's. So let's be conservative and only ask for * (roughly) twice the number of vectors as there are CPU's. */ + ncpu = min_t(int, num_online_cpus(), DEFAULT_MAX_NUM_RSS_QUEUES); v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues, - (int)(num_online_cpus() * 2)) + NON_Q_VECTORS; + ncpu * 2) + NON_Q_VECTORS; /* A failure in MSI-X entry allocation isn't fatal, but it does * mean we disable MSI-X capabilities of the adapter. */ -- 1.7.9.rc2