From patchwork Wed Oct 2 10:49:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 280077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3422C2C193B for ; Thu, 3 Oct 2013 03:54:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755148Ab3JBRyD (ORCPT ); Wed, 2 Oct 2013 13:54:03 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:27105 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755179Ab3JBRyB (ORCPT ); Wed, 2 Oct 2013 13:54:01 -0400 Received: from dhcp-26-207.brq.redhat.com (localhost [127.0.0.1]) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r92AwIA6002662; Wed, 2 Oct 2013 12:58:18 +0200 Received: (from agordeev@localhost) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5/Submit) id r92AwDI0002655; Wed, 2 Oct 2013 12:58:13 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: [PATCH RFC 49/77] mlx5: Fix minimum number of MSI-Xs Date: Wed, 2 Oct 2013 12:49:05 +0200 Message-Id: X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The minimum number of MSI-Xs is (MLX5_EQ_VEC_COMP_BASE + 1) in one check and 2 in another check. Make the checks consistent and assume the minimum number is (MLX5_EQ_VEC_COMP_BASE + 1). Signed-off-by: Alexander Gordeev --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 5e5c9a3..adf0e5d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -136,7 +136,7 @@ retry: err = pci_enable_msix(dev->pdev, table->msix_arr, nvec); if (err <= 0) { return err; - } else if (err > 2) { + } else if (err > MLX5_EQ_VEC_COMP_BASE) { nvec = err; goto retry; }