From patchwork Thu Oct 4 18:14:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 189233 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 0B3872C03CB for ; Fri, 5 Oct 2012 04:16:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753638Ab2JDSPQ (ORCPT ); Thu, 4 Oct 2012 14:15:16 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:41107 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013Ab2JDSPO (ORCPT ); Thu, 4 Oct 2012 14:15:14 -0400 Received: by mail-wg0-f44.google.com with SMTP id dr13so731962wgb.1 for ; Thu, 04 Oct 2012 11:15:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=iASlvWBChei7bh041xT/Yd4W4yhX72xr06KW1pmqEbQ=; b=SiDUAmEvtC1ZgErcRimZQE58Jeyw/n72DTm/6iFCaXLpxnDHsZ2sDy78MHVRgpYpiV W7MIGaVQgVXA7ymckWU7OaeHnPEjEETHbosp/+9lwrXmSwl6PpzY5t/+cKQe2ZEdYvPS clCKjsU1HDzFX7zNISx6qnfB0poBEpEEG+SgHzOKGEDIPSBofYGRMjNrpJ08P45AG95g rLhMs9AMsIwGWs/1bgiiyfI+uH57WV6hfKEIQPbTEbkMEOiJizRa85W4Q/OF4IDhLSpy Pev81+LnPgX1UdXS0vAYnCXvlk939THPJ8QaOqAdkLk+SLYZB9Fs3I1vYw4JLNJxtGcm ZfmQ== Received: by 10.181.13.239 with SMTP id fb15mr14630942wid.22.1349374513694; Thu, 04 Oct 2012 11:15:13 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id m14sm33586551wie.8.2012.10.04.11.15.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 11:15:13 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Simek , Anirudha Sarangi , John Linn , Grant Likely , Rob Herring , "David S. Miller" Subject: [PATCH 07/11] net: ll_temac: Fix DMA map size bug Date: Thu, 4 Oct 2012 20:14:53 +0200 Message-Id: <1349374497-9540-7-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349374497-9540-1-git-send-email-monstr@monstr.eu> References: <1349374497-9540-1-git-send-email-monstr@monstr.eu> X-Gm-Message-State: ALoCoQl0x9NKC6Tv/GofVFQ3D+a5n7mByo6jRftf5ijRmOFK7BCKDI9vhMUQtHi6zEL1+YvA2bGd Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org DMA allocates skb->len instead of headlen which is used for DMA. The same fix was applied to the axienet driver. Signed-off-by: Michal Simek CC: Anirudha Sarangi CC: John Linn CC: Grant Likely CC: Rob Herring CC: David S. Miller --- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 482b572..8786d92 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -710,8 +710,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p->app0 |= STS_CTRL_APP0_SOP; cur_p->len = skb_headlen(skb); - cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len, - DMA_TO_DEVICE); + cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, + skb_headlen(skb), DMA_TO_DEVICE); cur_p->app4 = (unsigned long)skb; for (ii = 0; ii < num_frag; ii++) {