diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-06 06:10:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-06 16:17:20 -0400 |
commit | 5d6bcdfe38ce883946aebf751a64695471ce1ab5 (patch) | |
tree | b59bf91fab666e8d8bd7dfb20b70c42d422e6bfa /drivers/net/ethernet/broadcom/tg3.c | |
parent | 27737aa3a9f65012b3656b71e0ff230a4811da4d (diff) |
net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map
When I converted some drivers from pci_map_page to skb_frag_dma_map I
neglected to convert PCI_DMA_xDEVICE into DMA_x_DEVICE and
pci_dma_mapping_error into dma_mapping_error.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 26c6bd44a604..9dbd1af6653c 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -6779,12 +6779,12 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
6779 | 6779 | ||
6780 | len = frag->size; | 6780 | len = frag->size; |
6781 | mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, | 6781 | mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, |
6782 | len, PCI_DMA_TODEVICE); | 6782 | len, DMA_TO_DEVICE); |
6783 | 6783 | ||
6784 | tnapi->tx_buffers[entry].skb = NULL; | 6784 | tnapi->tx_buffers[entry].skb = NULL; |
6785 | dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping, | 6785 | dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping, |
6786 | mapping); | 6786 | mapping); |
6787 | if (pci_dma_mapping_error(tp->pdev, mapping)) | 6787 | if (dma_mapping_error(&tp->pdev->dev, mapping)) |
6788 | goto dma_error; | 6788 | goto dma_error; |
6789 | 6789 | ||
6790 | if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping, | 6790 | if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping, |