summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/pasemi
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-10-06 11:10:48 +0100
committerDavid S. Miller <davem@davemloft.net>2011-10-06 16:17:20 -0400
commit5d6bcdfe38ce883946aebf751a64695471ce1ab5 (patch)
treeb59bf91fab666e8d8bd7dfb20b70c42d422e6bfa /drivers/net/ethernet/pasemi
parent27737aa3a9f65012b3656b71e0ff230a4811da4d (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/pasemi')
-rw-r--r--drivers/net/ethernet/pasemi/pasemi_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 532209588323..c6f005684677 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -1506,9 +1506,9 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
map[i + 1] = skb_frag_dma_map(&mac->dma_pdev->dev, frag, 0,
- frag->size, PCI_DMA_TODEVICE);
+ frag->size, DMA_TO_DEVICE);
map_size[i+1] = frag->size;
- if (pci_dma_mapping_error(mac->dma_pdev, map[i+1])) {
+ if (dma_mapping_error(&mac->dma_pdev->dev, map[i + 1])) {
nfrags = i;
goto out_err_nolock;
}