From patchwork Wed Sep 24 18:23:42 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 1327 X-Patchwork-Delegate: jgarzik@pobox.com 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.176.167]) by ozlabs.org (Postfix) with ESMTP id CB629DE139 for ; Thu, 25 Sep 2008 04:25:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755008AbYIXSYf (ORCPT ); Wed, 24 Sep 2008 14:24:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755007AbYIXSYe (ORCPT ); Wed, 24 Sep 2008 14:24:34 -0400 Received: from sj-iport-2.cisco.com ([171.71.176.71]:22077 "EHLO sj-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754867AbYIXSYd (ORCPT ); Wed, 24 Sep 2008 14:24:33 -0400 X-IronPort-AV: E=Sophos;i="4.33,302,1220227200"; d="scan'208";a="89080588" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-2.cisco.com with ESMTP; 24 Sep 2008 18:24:33 +0000 Received: from sj-core-1.cisco.com (sj-core-1.cisco.com [171.71.177.237]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id m8OIOXtg002770; Wed, 24 Sep 2008 11:24:33 -0700 Received: from palito_client100.nuovasystems.com ([172.30.136.82]) by sj-core-1.cisco.com (8.13.8/8.13.8) with ESMTP id m8OIOXmt001955; Wed, 24 Sep 2008 18:24:33 GMT From: Scott Feldman Subject: [PATCH 3/4] enic: Bug fix: Free MSI intr with correct data handle To: jgarzik@pobox.com Cc: netdev@vger.kernel.org Date: Wed, 24 Sep 2008 11:23:42 -0700 Message-ID: <20080924182342.22778.94916.stgit@palito_client100.nuovasystems.com> In-Reply-To: <20080924182154.22778.76605.stgit@palito_client100.nuovasystems.com> References: <20080924182154.22778.76605.stgit@palito_client100.nuovasystems.com> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=1479; t=1222280673; x=1223144673; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=scofeldm@cisco.com; z=From:=20Scott=20Feldman=20 |Subject:=20[PATCH=203/4]=20enic=3A=20Bug=20fix=3A=20Free=2 0MSI=20intr=20with=20correct=20data=20handle |Sender:=20; bh=MxlVasZvlMzpEdbELkrfaLtB4k3hgYt0NIbB0aT/tEE=; b=AVkF6wCC9NVx4ul7IDGMhTBqb0HPR4PX3h8mFwXCh7mMb/Mkw2QrS0ZDb4 jxzQPxlmZQaOmpCc0OuvkJQJf76F827QC3t73i2sJoRRAcCiz67HIUCybJjl lxF7FwjhGH; Authentication-Results: sj-dkim-2; header.From=scofeldm@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: Bug fix: Free MSI intr with correct data handle Bug fix: Free MSI intr with correct data handle Use davem proposed naming for MSI-X tx/rx vectors (ethX-tx-0, ethX-rx-0) Signed-off-by: Scott Feldman --- drivers/net/enic/enic_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index c741bbf..14e59a7 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1134,9 +1134,11 @@ static void enic_free_intr(struct enic *enic) switch (vnic_dev_get_intr_mode(enic->vdev)) { case VNIC_DEV_INTR_MODE_INTX: - case VNIC_DEV_INTR_MODE_MSI: free_irq(enic->pdev->irq, netdev); break; + case VNIC_DEV_INTR_MODE_MSI: + free_irq(enic->pdev->irq, enic); + break; case VNIC_DEV_INTR_MODE_MSIX: for (i = 0; i < ARRAY_SIZE(enic->msix); i++) if (enic->msix[i].requested) @@ -1171,12 +1173,12 @@ static int enic_request_intr(struct enic *enic) case VNIC_DEV_INTR_MODE_MSIX: sprintf(enic->msix[ENIC_MSIX_RQ].devname, - "%.11s-rx", netdev->name); + "%.11s-rx-0", netdev->name); enic->msix[ENIC_MSIX_RQ].isr = enic_isr_msix_rq; enic->msix[ENIC_MSIX_RQ].devid = enic; sprintf(enic->msix[ENIC_MSIX_WQ].devname, - "%.11s-tx", netdev->name); + "%.11s-tx-0", netdev->name); enic->msix[ENIC_MSIX_WQ].isr = enic_isr_msix_wq; enic->msix[ENIC_MSIX_WQ].devid = enic;