projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
740c7f3
)
sh_eth: Check for DMA mapping errors on transmit
author
Ben Hutchings
<
[email protected]
>
Tue, 27 Jan 2015 00:49:47 +0000
(
00:49
+0000)
committer
David S. Miller
<
[email protected]
>
Tue, 27 Jan 2015 08:18:53 +0000
(
00:18
-0800)
dma_map_single() may fail if an IOMMU or swiotlb is in use, so
we need to check for this.
Signed-off-by: Ben Hutchings <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/renesas/sh_eth.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/renesas/sh_eth.c
b/drivers/net/ethernet/renesas/sh_eth.c
index 245166bbccfdf394f97bd6cf5590cf11b48cdef6..4a085da571882946592def60f9a8ddaae1cd77a9 100644
(file)
--- a/
drivers/net/ethernet/renesas/sh_eth.c
+++ b/
drivers/net/ethernet/renesas/sh_eth.c
@@
-2174,6
+2174,10
@@
static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
skb->len + 2);
txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
DMA_TO_DEVICE);
+ if (dma_mapping_error(&ndev->dev, txdesc->addr)) {
+ kfree_skb(skb);
+ return NETDEV_TX_OK;
+ }
txdesc->buffer_length = skb->len;
if (entry >= mdp->num_tx_ring - 1)