From cf6c63950021aff93f251e70d0e9d1da51fa2517 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Wed, 20 Oct 2010 22:25:43 +0000 Subject: [PATCH] --- yaml --- r: 215399 b: refs/heads/master c: d827d86b6fe87b420ef3c0685ab580290ae64beb h: refs/heads/master i: 215397: 551c8f91961f658005d501f1b12cdbe3b520ac8c 215395: 80b72c2a85ee99afdd468ffddeeb5d12f03d4789 215391: 00f931faad36a8df8d20a0871abd4e6abbd318df v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 42dfb0b1d7bd..9dff1c548e76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fccec10b33503a2b1197c8e7a3abd30443bedb08 +refs/heads/master: d827d86b6fe87b420ef3c0685ab580290ae64beb diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 0204fe2b2490..d88ce9fb1cbd 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/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);