From patchwork Fri Nov 7 11:46:55 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sosnowski, Maciej" X-Patchwork-Id: 7699 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 1AC72DDEFD for ; Fri, 7 Nov 2008 22:58:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754559AbYKGL6V (ORCPT ); Fri, 7 Nov 2008 06:58:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754505AbYKGL6V (ORCPT ); Fri, 7 Nov 2008 06:58:21 -0500 Received: from mga09.intel.com ([134.134.136.24]:62965 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753221AbYKGL6U (ORCPT ); Fri, 7 Nov 2008 06:58:20 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2008 03:52:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.33,564,1220252400"; d="scan'208";a="357311790" Received: from gklab-190-232.igk.intel.com (HELO linux.site) ([172.28.190.232]) by orsmga002.jf.intel.com with ESMTP; 07 Nov 2008 03:57:32 -0800 From: Maciej Sosnowski Subject: [PATCH 3/4] I/OAT: fix async_tx.callback checking To: dan.j.williams@intel.com Cc: tom.s.picard@intel.com, mark_rustad@Xiotech.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, stable@kernel.org Date: Fri, 07 Nov 2008 12:46:55 +0100 Message-ID: <20081107114642.25190.49701.stgit@linux.site> In-Reply-To: <20081107114325.25190.5419.stgit@linux.site> References: <20081107114325.25190.5419.stgit@linux.site> User-Agent: StGIT/0.13 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Sosnowski async_tx.callback should be checked for the first not the last descriptor in the chain. Cc: Signed-off-by: Maciej Sosnowski --- drivers/dma/ioat_dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 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/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 687eef7..c5af17a 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -525,7 +525,7 @@ static dma_cookie_t ioat1_tx_submit(stru } hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS; - if (new->async_tx.callback) { + if (first->async_tx.callback) { hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN; if (first != new) { /* move callback into to last desc */ @@ -617,7 +617,7 @@ static dma_cookie_t ioat2_tx_submit(stru } hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_CP_STS; - if (new->async_tx.callback) { + if (first->async_tx.callback) { hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN; if (first != new) { /* move callback into to last desc */