From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: <netdev@vger.kernel.org>, <davem@davemloft.net>, <havard@skinnemoen.net>
Cc: <bhutchings@solarflare.com>,
<linux-arm-kernel@lists.infradead.org>, <plagnioj@jcrosoft.com>,
<patrice.vilchez@atmel.com>, <linux-kernel@vger.kernel.org>,
<manabian@gmail.com>, Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: [PATCH] net/at91_ether: fix the use of macb structure
Date: Tue, 30 Oct 2012 12:30:28 +0100 [thread overview]
Message-ID: <1351596628-3405-1-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <75eb5df193c504e68ebff7d6a6a88d9a1cc678cb.1351591858.git.nicolas.ferre@atmel.com>
Due to the use of common structure in at91_ether and macb drivers,
change the name of DMA descriptor structures in at91_ether as well:
dma_desc => macb_dma_desc
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Hi,
This patch is a fix for the patch
[PATCH v3 06/10] net/macb: clean up ring buffer logic
that I have just sent.
I would prefer to merge it with the patch mentioned above
that introduces the issue. Tell me if you do it or if I
have to provide a v4 for this patch series.
drivers/net/ethernet/cadence/at91_ether.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index b92815a..0d6392d 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -156,7 +156,7 @@ static int at91ether_start(struct net_device *dev)
int i;
lp->rx_ring = dma_alloc_coherent(&lp->pdev->dev,
- MAX_RX_DESCR * sizeof(struct dma_desc),
+ MAX_RX_DESCR * sizeof(struct macb_dma_desc),
&lp->rx_ring_dma, GFP_KERNEL);
if (!lp->rx_ring) {
netdev_err(lp->dev, "unable to alloc rx ring DMA buffer\n");
@@ -170,7 +170,7 @@ static int at91ether_start(struct net_device *dev)
netdev_err(lp->dev, "unable to alloc rx data DMA buffer\n");
dma_free_coherent(&lp->pdev->dev,
- MAX_RX_DESCR * sizeof(struct dma_desc),
+ MAX_RX_DESCR * sizeof(struct macb_dma_desc),
lp->rx_ring, lp->rx_ring_dma);
lp->rx_ring = NULL;
return -ENOMEM;
@@ -256,7 +256,7 @@ static int at91ether_close(struct net_device *dev)
netif_stop_queue(dev);
dma_free_coherent(&lp->pdev->dev,
- MAX_RX_DESCR * sizeof(struct dma_desc),
+ MAX_RX_DESCR * sizeof(struct macb_dma_desc),
lp->rx_ring, lp->rx_ring_dma);
lp->rx_ring = NULL;
--
1.8.0
next prev parent reply other threads:[~2012-10-30 11:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 10:17 [PATCH v3 00/10] net/macb: driver enhancement concerning GEM support, ring logic and cleanup Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 01/10] net/macb: Add support for Gigabit Ethernet mode Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 02/10] net/macb: memory barriers cleanup Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 03/10] net/macb: change debugging messages Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 04/10] net/macb: remove macb_get_drvinfo() Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 05/10] net/macb: tx status is more than 8 bits now Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 06/10] net/macb: clean up ring buffer logic Nicolas Ferre
2012-10-30 11:12 ` David Laight
2012-10-30 18:22 ` Håvard Skinnemoen
2012-10-31 8:57 ` David Laight
2012-10-31 9:59 ` Nicolas Ferre
2012-10-31 10:39 ` Nicolas Ferre
2012-10-31 9:48 ` David Laight
2012-10-30 11:30 ` Nicolas Ferre [this message]
2012-11-03 19:04 ` [PATCH] net/at91_ether: fix the use of macb structure David Miller
2012-11-04 23:02 ` Nicolas Ferre
2012-10-30 10:17 ` [PATCH v3 07/10] net/macb: ethtool interface: add register dump feature Nicolas Ferre
2012-10-30 10:18 ` [PATCH v3 08/10] net/macb: better manage tx errors Nicolas Ferre
2012-10-30 10:18 ` [PATCH v3 09/10] net/macb: Offset first RX buffer by two bytes Nicolas Ferre
2012-10-30 10:18 ` [PATCH v3 10/10] net/macb: add pinctrl consumer support Nicolas Ferre
2012-10-30 17:37 ` Joachim Eastwood
2012-10-31 10:42 ` Nicolas Ferre
2012-10-30 11:26 ` [PATCH v3 00/10] net/macb: driver enhancement concerning GEM support, ring logic and cleanup Nicolas Ferre
2012-10-30 17:31 ` Joachim Eastwood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351596628-3405-1-git-send-email-nicolas.ferre@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=havard@skinnemoen.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=patrice.vilchez@atmel.com \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).