From patchwork Tue Jun 19 15:14:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Mintz X-Patchwork-Id: 165763 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 4FD15B700F for ; Wed, 20 Jun 2012 01:16:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754338Ab2FSPQk (ORCPT ); Tue, 19 Jun 2012 11:16:40 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4204 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269Ab2FSPQh (ORCPT ); Tue, 19 Jun 2012 11:16:37 -0400 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Tue, 19 Jun 2012 08:15:47 -0700 X-Server-Uuid: 4500596E-606A-40F9-852D-14843D8201B2 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Tue, 19 Jun 2012 08:15:47 -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 477AF9F9F6; Tue, 19 Jun 2012 08:16:26 -0700 (PDT) From: "Yuval Mintz" To: netdev@vger.kernel.org, davem@davemloft.net cc: eilong@broadcom.com, "Yuval Mintz" , "Divy Le Ray" Subject: [RFC net-next 08/14] Fix chelsio/cxgb3 Date: Tue, 19 Jun 2012 18:14:02 +0300 Message-ID: <1340118848-30978-9-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: 63FE482950S1823239-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: Divy Le Ray --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index abb6ce7..17d7829 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -3050,7 +3050,8 @@ static struct pci_error_handlers t3_err_handler = { static void set_nqsets(struct adapter *adap) { int i, j = 0; - int num_cpus = num_online_cpus(); + int num_cpus = min_t(int, num_online_cpus(), + DEFAULT_MAX_NUM_RSS_QUEUES); int hwports = adap->params.nports; int nqsets = adap->msix_nvectors - 1;