From patchwork Thu Jun 21 09:19:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 166272 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 66F1DB6FA0 for ; Thu, 21 Jun 2012 19:19:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932417Ab2FUJTn (ORCPT ); Thu, 21 Jun 2012 05:19:43 -0400 Received: from eu1sys200aog106.obsmtp.com ([207.126.144.121]:40851 "HELO eu1sys200aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932366Ab2FUJTl (ORCPT ); Thu, 21 Jun 2012 05:19:41 -0400 Received: from mtlsws123.lab.mtl.com ([82.166.227.17]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKT+LnKl6wLnnE6p8e6NmuexhrPl7IVH/6@postini.com; Thu, 21 Jun 2012 09:19:41 UTC Received: from r-vnc07.lab.mtl.com (r-vnc07.lab.mtl.com [10.208.0.119]) by mtlsws123.lab.mtl.com (8.13.8/8.13.8) with ESMTP id q5L9JI81011170; Thu, 21 Jun 2012 12:19:38 +0300 From: Yevgeny Petrilin To: davem@davemloft.net Cc: netdev@vger.kernel.org, Yevgeny Petrilin Subject: [PATCH 2/4] net/mlx4: Use single completion vector after NOP failure Date: Thu, 21 Jun 2012 12:19:15 +0300 Message-Id: <1340270358-19504-3-git-send-email-yevgenyp@mellanox.co.il> X-Mailer: git-send-email 1.7.8.2 In-Reply-To: <1340270358-19504-1-git-send-email-yevgenyp@mellanox.co.il> References: <1340270358-19504-1-git-send-email-yevgenyp@mellanox.co.il> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix a crash at the error flow of NOP command which caused the driver to try and use a completion vector which wasn't allocated. Signed-off-by: Yevgeny Petrilin --- drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 18c8deb..c91a2b8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1978,6 +1978,8 @@ slave_start: if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) && !mlx4_is_mfunc(dev)) { dev->flags &= ~MLX4_FLAG_MSI_X; + dev->caps.num_comp_vectors = 1; + dev->caps.comp_pool = 0; pci_disable_msix(pdev); err = mlx4_setup_hca(dev); }