From patchwork Wed Jan 20 20:45:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 43368 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 0BDFBB7D40 for ; Thu, 21 Jan 2010 08:23:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754755Ab0ATVXY (ORCPT ); Wed, 20 Jan 2010 16:23:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754758Ab0ATVXW (ORCPT ); Wed, 20 Jan 2010 16:23:22 -0500 Received: from suva.vyatta.com ([76.74.103.44]:53912 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754623Ab0ATVXG (ORCPT ); Wed, 20 Jan 2010 16:23:06 -0500 X-Greylist: delayed 1910 seconds by postgrey-1.27 at vger.kernel.org; Wed, 20 Jan 2010 16:22:54 EST Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id o0KKpjxM000981; Wed, 20 Jan 2010 12:51:45 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id o0KKpePw000963; Wed, 20 Jan 2010 12:51:40 -0800 Message-Id: <20100120204559.177544514@vyatta.com> References: <20100120204459.820265084@vyatta.com> User-Agent: quilt/0.46-1 Date: Wed, 20 Jan 2010 12:45:05 -0800 From: Stephen Hemminger To: David Miller , Jarek Poplawski , Grant Grundler Cc: netdev@vger.kernel.org Subject: [PATCH 06/11] de2104x: fix DMA sync_single length error Content-Disposition: inline; filename=de2104x.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DMA api requires that the full mapping be sync'd when copying frame. First found by Jarek on sky2. Signed-off-by: Stephen Hemminger --- a/drivers/net/tulip/de2104x.c 2010-01-20 11:41:20.878138314 -0800 +++ b/drivers/net/tulip/de2104x.c 2010-01-20 11:41:59.858847380 -0800 @@ -456,11 +456,13 @@ static void de_rx (struct de_private *de buflen, PCI_DMA_FROMDEVICE); de->rx_skb[rx_tail].skb = copy_skb; } else { - pci_dma_sync_single_for_cpu(de->pdev, mapping, len, PCI_DMA_FROMDEVICE); + pci_dma_sync_single_for_cpu(de->pdev, mapping, + buflen, PCI_DMA_FROMDEVICE); skb_reserve(copy_skb, RX_OFFSET); skb_copy_from_linear_data(skb, skb_put(copy_skb, len), len); - pci_dma_sync_single_for_device(de->pdev, mapping, len, PCI_DMA_FROMDEVICE); + pci_dma_sync_single_for_device(de->pdev, mapping, + buflen, PCI_DMA_FROMDEVICE); /* We'll reuse the original ring buffer. */ skb = copy_skb;