summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlcnic
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/qlogic/qlcnic
parent27737aa3a9f65012b3656b71e0ff230a4811da4d (diff)
downloadblackbird-op-linux-5d6bcdfe38ce883946aebf751a64695471ce1ab5.tar.gz
blackbird-op-linux-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/qlogic/qlcnic')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 445956e2d045..eac19e7d2761 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2136,8 +2136,8 @@ qlcnic_map_tx_skb(struct pci_dev *pdev,
nf = &pbuf->frag_array[i+1];
map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
- PCI_DMA_TODEVICE);
- if (pci_dma_mapping_error(pdev, map))
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(&pdev->dev, map))
goto unwind;
nf->dma = map;
OpenPOWER on IntegriCloud