From patchwork Tue Jun 19 15:14:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Mintz X-Patchwork-Id: 165769 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 0A590B700F for ; Wed, 20 Jun 2012 01:17:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754460Ab2FSPQ5 (ORCPT ); Tue, 19 Jun 2012 11:16:57 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4114 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754430Ab2FSPQx (ORCPT ); Tue, 19 Jun 2012 11:16:53 -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:57 -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:35 -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 3104E9F9F5; Tue, 19 Jun 2012 08:16:33 -0700 (PDT) From: "Yuval Mintz" To: netdev@vger.kernel.org, davem@davemloft.net cc: eilong@broadcom.com, "Yuval Mintz" , "Matt Carlson" Subject: [RFC net-next 12/14] Fix broadcom/tg3 Date: Tue, 19 Jun 2012 18:14:06 +0300 Message-ID: <1340118848-30978-13-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: 63FE48273MK2358850-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: Matt Carlson --- drivers/net/ethernet/broadcom/tg3.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index e47ff8b..d431f17 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -9908,7 +9908,8 @@ static bool tg3_enable_msix(struct tg3 *tp) int i, rc; struct msix_entry msix_ent[tp->irq_max]; - tp->irq_cnt = num_online_cpus(); + tp->irq_cnt = min_t(unsigned, num_online_cpus(), + DEFAULT_MAX_NUM_RSS_QUEUES); if (tp->irq_cnt > 1) { /* We want as many rx rings enabled as there are cpus. * In multiqueue MSI-X mode, the first MSI-X vector @@ -10967,7 +10968,8 @@ static int tg3_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, if (netif_running(tp->dev)) info->data = tp->irq_cnt; else { - info->data = num_online_cpus(); + info->data = min_t(u32, num_online_cpus(), + DEFAULT_MAX_NUM_RSS_QUEUES); if (info->data > TG3_IRQ_MAX_VECS_RSS) info->data = TG3_IRQ_MAX_VECS_RSS; }