summaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-02-05 11:15:05 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-08 09:35:39 +0100
commita097eabc81e932a54092722c81599a8dfe27a944 (patch)
tree35b96f46e5917781dbbbade8a2a45c03a2c4ec9d /drivers/net/macb.c
parent554ab80b8788be5d2385194aaffdd6cf01b33742 (diff)
downloadbarebox-a097eabc81e932a54092722c81599a8dfe27a944.tar.gz
barebox-a097eabc81e932a54092722c81599a8dfe27a944.tar.xz
macb: report timeout on send
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 98bd2fcf4c..454832ca8f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -111,6 +111,7 @@ static int macb_send(struct eth_device *edev, void *packet,
{
struct macb_device *macb = edev->priv;
unsigned long ctrl;
+ int ret;
dev_dbg(macb->dev, "%s\n", __func__);
@@ -123,7 +124,7 @@ static int macb_send(struct eth_device *edev, void *packet,
dma_flush_range((ulong) packet, (ulong)packet + length);
macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
- wait_on_timeout(100 * MSECOND,
+ ret = wait_on_timeout(100 * MSECOND,
!(macb->tx_ring[0].ctrl & TXBUF_USED));
ctrl = macb->tx_ring[0].ctrl;
@@ -132,9 +133,10 @@ static int macb_send(struct eth_device *edev, void *packet,
dev_err(macb->dev, "TX underrun\n");
if (ctrl & TXBUF_EXHAUSTED)
dev_err(macb->dev, "TX buffers exhausted in mid frame\n");
+ if (ret)
+ dev_err(macb->dev,"TX timeout\n");
- /* No one cares anyway */
- return 0;
+ return ret;
}
static void reclaim_rx_buffers(struct macb_device *macb,