summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-10-20 22:25:43 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-21 01:32:48 -0700
commitd827d86b6fe87b420ef3c0685ab580290ae64beb (patch)
tree9225a175bd59ab37638daf50346ec2a79d272930
parentfccec10b33503a2b1197c8e7a3abd30443bedb08 (diff)
downloadop-kernel-dev-d827d86b6fe87b420ef3c0685ab580290ae64beb.zip
op-kernel-dev-d827d86b6fe87b420ef3c0685ab580290ae64beb.tar.gz
r8169: print errors when dma mapping fail
If dma mapping fail we are dropping packages or fail to open device. But exact reason of drop/fail stays unknow for a user, so print errors. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/r8169.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 0204fe2b..d88ce9f 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3974,8 +3974,11 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp,
mapping = dma_map_single(d, rtl8169_align(data), rx_buf_sz,
DMA_FROM_DEVICE);
- if (unlikely(dma_mapping_error(d, mapping)))
+ if (unlikely(dma_mapping_error(d, mapping))) {
+ if (net_ratelimit())
+ netif_err(tp, drv, tp->dev, "Failed to map RX DMA!\n");
goto err_out;
+ }
rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
return data;
@@ -4203,8 +4206,12 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
len = frag->size;
addr = ((void *) page_address(frag->page)) + frag->page_offset;
mapping = dma_map_single(d, addr, len, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(d, mapping)))
+ if (unlikely(dma_mapping_error(d, mapping))) {
+ if (net_ratelimit())
+ netif_err(tp, drv, tp->dev,
+ "Failed to map TX fragments DMA!\n");
goto err_out;
+ }
/* anti gcc 2.95.3 bugware (sic) */
status = opts1 | len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
@@ -4270,8 +4277,11 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
len = skb_headlen(skb);
mapping = dma_map_single(d, skb->data, len, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(d, mapping)))
+ if (unlikely(dma_mapping_error(d, mapping))) {
+ if (net_ratelimit())
+ netif_err(tp, drv, dev, "Failed to map TX DMA!\n");
goto err_dma_0;
+ }
tp->tx_skb[entry].len = len;
txd->addr = cpu_to_le64(mapping);
OpenPOWER on IntegriCloud