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/nvidia/forcedeth.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/nvidia/forcedeth.c')
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 4e39b8c04397..84baa59430bb 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -2150,7 +2150,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2150 | &np->pci_dev->dev, | 2150 | &np->pci_dev->dev, |
2151 | frag, offset, | 2151 | frag, offset, |
2152 | bcnt, | 2152 | bcnt, |
2153 | PCI_DMA_TODEVICE); | 2153 | DMA_TO_DEVICE); |
2154 | np->put_tx_ctx->dma_len = bcnt; | 2154 | np->put_tx_ctx->dma_len = bcnt; |
2155 | np->put_tx_ctx->dma_single = 0; | 2155 | np->put_tx_ctx->dma_single = 0; |
2156 | put_tx->buf = cpu_to_le32(np->put_tx_ctx->dma); | 2156 | put_tx->buf = cpu_to_le32(np->put_tx_ctx->dma); |
@@ -2264,7 +2264,7 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb, | |||
2264 | &np->pci_dev->dev, | 2264 | &np->pci_dev->dev, |
2265 | frag, offset, | 2265 | frag, offset, |
2266 | bcnt, | 2266 | bcnt, |
2267 | PCI_DMA_TODEVICE); | 2267 | DMA_TO_DEVICE); |
2268 | np->put_tx_ctx->dma_len = bcnt; | 2268 | np->put_tx_ctx->dma_len = bcnt; |
2269 | np->put_tx_ctx->dma_single = 0; | 2269 | np->put_tx_ctx->dma_single = 0; |
2270 | put_tx->bufhigh = cpu_to_le32(dma_high(np->put_tx_ctx->dma)); | 2270 | put_tx->bufhigh = cpu_to_le32(dma_high(np->put_tx_ctx->dma)); |