From patchwork Wed Feb 3 23:12:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 44429 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 93854B7D4D for ; Thu, 4 Feb 2010 10:13:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757724Ab0BCXNM (ORCPT ); Wed, 3 Feb 2010 18:13:12 -0500 Received: from qmta14.emeryville.ca.mail.comcast.net ([76.96.27.212]:57324 "EHLO qmta14.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755606Ab0BCXNJ (ORCPT ); Wed, 3 Feb 2010 18:13:09 -0500 Received: from omta14.emeryville.ca.mail.comcast.net ([76.96.30.60]) by qmta14.emeryville.ca.mail.comcast.net with comcast id dasm1d0081HpZEsAEbD9oR; Wed, 03 Feb 2010 23:13:09 +0000 Received: from localhost.localdomain ([63.64.152.142]) by omta14.emeryville.ca.mail.comcast.net with comcast id dbCs1d00B34bfcX8abCv3t; Wed, 03 Feb 2010 23:13:07 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 1/2] ixgbe: Fix ixgbe_tx_map error path To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Anton Blanchard , Jeff Kirsher Date: Wed, 03 Feb 2010 15:12:51 -0800 Message-ID: <20100203231224.15352.27988.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Anton Blanchard Commit e5a43549f7a58509a91b299a51337d386697b92c (ixgbe: remove skb_dma_map/unmap calls from driver) looks to have introduced a bug in ixgbe_tx_map. If we get an error from a PCI DMA call, we loop backwards through count until it becomes -1 and return that. The caller of ixgbe_tx_map expects 0 on error, so return that instead. Signed-off-by: Anton Blanchard Signed-off-by: Jeff Kirsher --- drivers/net/ixgbe/ixgbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 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/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index b5f64ad..37e2af0 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5179,7 +5179,7 @@ dma_error: ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info); } - return count; + return 0; } static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,