From patchwork Tue Jun 19 15:14:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Mintz X-Patchwork-Id: 165770 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8BFC6B700F for ; Wed, 20 Jun 2012 01:17:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754070Ab2FSPQe (ORCPT ); Tue, 19 Jun 2012 11:16:34 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:3913 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424Ab2FSPQd (ORCPT ); Tue, 19 Jun 2012 11:16:33 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Tue, 19 Jun 2012 08:15:47 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Tue, 19 Jun 2012 08:16:25 -0700 Received: from lb-tlvb-yuvalmin.il.broadcom.com ( lb-tlvb-yuvalmin.il.broadcom.com [10.185.6.94]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 7F9209F9F5; Tue, 19 Jun 2012 08:16:24 -0700 (PDT) From: "Yuval Mintz" To: netdev@vger.kernel.org, davem@davemloft.net cc: eilong@broadcom.com, "Yuval Mintz" , "Jeff Kirsher" Subject: [RFC net-next 07/14] Fix intel/ixgbe Date: Tue, 19 Jun 2012 18:14:01 +0300 Message-ID: <1340118848-30978-8-git-send-email-yuvalmin@broadcom.com> X-Mailer: git-send-email 1.7.9.rc2 In-Reply-To: <1340118848-30978-1-git-send-email-yuvalmin@broadcom.com> References: <1340118848-30978-1-git-send-email-yuvalmin@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 63FE48293MK2358796-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Yuval Mintz Signed-off-by: Eilon Greenstein Cc: Jeff Kirsher --- drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index af1a531..21e4513 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c @@ -802,7 +802,8 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) * The default is to use pairs of vectors. */ v_budget = max(adapter->num_rx_queues, adapter->num_tx_queues); - v_budget = min_t(int, v_budget, num_online_cpus()); + v_budget = min_t(int, v_budget, min_t(int, num_online_cpus(), + DEFAULT_MAX_NUM_RSS_QUEUES)); v_budget += NON_Q_VECTORS; /*