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/sfc/tx.c | |
| parent | dcb: Add stub routines for !CONFIG_DCB (diff) | |
| download | linux-dev-5d6bcdfe38ce883946aebf751a64695471ce1ab5.tar.xz linux-dev-5d6bcdfe38ce883946aebf751a64695471ce1ab5.zip | |
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/sfc/tx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index f2467a1b51bd..3964a62dde8b 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -243,7 +243,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) /* Map for DMA */ unmap_single = false; dma_addr = skb_frag_dma_map(&pci_dev->dev, fragment, 0, len, - PCI_DMA_TODEVICE); + DMA_TO_DEVICE); } /* Transfer ownership of the skb to the final buffer */ @@ -926,8 +926,8 @@ static int tso_get_fragment(struct tso_state *st, struct efx_nic *efx, skb_frag_t *frag) { st->unmap_addr = skb_frag_dma_map(&efx->pci_dev->dev, frag, 0, - frag->size, PCI_DMA_TODEVICE); - if (likely(!pci_dma_mapping_error(efx->pci_dev, st->unmap_addr))) { + frag->size, DMA_TO_DEVICE); + if (likely(!dma_mapping_error(&efx->pci_dev->dev, st->unmap_addr))) { st->unmap_single = false; st->unmap_len = frag->size; st->in_len = frag->size; |