From patchwork Thu Aug 29 20:11:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle McMartin X-Patchwork-Id: 270933 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 B49122C0089 for ; Fri, 30 Aug 2013 06:12:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757286Ab3H2UL4 (ORCPT ); Thu, 29 Aug 2013 16:11:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14294 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757112Ab3H2ULy (ORCPT ); Thu, 29 Aug 2013 16:11:54 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7TKBrL2010726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 29 Aug 2013 16:11:53 -0400 Received: from redacted.bos.redhat.com ([10.18.17.143]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7TKBpo7026519 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 29 Aug 2013 16:11:53 -0400 Date: Thu, 29 Aug 2013 16:11:51 -0400 From: Kyle McMartin To: rob.herring@calxeda.com Cc: netdev@vger.kernel.org Subject: [PATCH] xgmac: use bufsz not dma_buf_sz in rx_refill Message-ID: <20130829201151.GJ8764@redacted.bos.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Noticed while debugging another issue that DMA debug turned up, looks like commit ef468d23 missed a case when switching to bufsz instead of priv->dma_buf_sz? (tbf, the whole handling of DMA buffers seems slightly suspect since we're not tracking the size, but trusting the hardware between map and unmap...) Signed-off-by: Kyle McMartin --- 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 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -686,7 +686,7 @@ static void xgmac_rx_refill(struct xgmac_priv *priv) priv->rx_skbuff[entry] = skb; paddr = dma_map_single(priv->device, skb->data, bufsz, DMA_FROM_DEVICE); - desc_set_buf_addr(p, paddr, priv->dma_buf_sz); + desc_set_buf_addr(p, paddr, bufsz); } netdev_dbg(priv->dev, "rx ring: head %d, tail %d\n",