diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-06 11:10:48 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-06 16:17:20 -0400 |
| commit | 5d6bcdfe38ce883946aebf751a64695471ce1ab5 (patch) | |
| tree | b59bf91fab666e8d8bd7dfb20b70c42d422e6bfa /drivers/net/ethernet/broadcom | |
| parent | 27737aa3a9f65012b3656b71e0ff230a4811da4d (diff) | |
| download | op-kernel-dev-5d6bcdfe38ce883946aebf751a64695471ce1ab5.zip op-kernel-dev-5d6bcdfe38ce883946aebf751a64695471ce1ab5.tar.gz | |
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')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 21bdda3..ad24d8c 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -6539,7 +6539,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) len = frag->size; mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len, - PCI_DMA_TODEVICE); + DMA_TO_DEVICE); if (dma_mapping_error(&bp->pdev->dev, mapping)) goto dma_error; dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping, diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 26c6bd4..9dbd1af 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) len = frag->size; mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, - len, PCI_DMA_TODEVICE); + len, DMA_TO_DEVICE); tnapi->tx_buffers[entry].skb = NULL; dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping, mapping); - if (pci_dma_mapping_error(tp->pdev, mapping)) + if (dma_mapping_error(&tp->pdev->dev, mapping)) goto dma_error; if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping, |
