aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-10-06 06:10:48 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-06 16:17:20 -0400
commit5d6bcdfe38ce883946aebf751a64695471ce1ab5 (patch)
treeb59bf91fab666e8d8bd7dfb20b70c42d422e6bfa /drivers/infiniband/hw
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/infiniband/hw')
-rw-r--r--drivers/infiniband/hw/amso1100/c2.c3
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 6a8f36e9d9ed..6e85a75289e8 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -803,8 +803,7 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
803 skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; 803 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
804 maplen = frag->size; 804 maplen = frag->size;
805 mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag, 805 mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag,
806 0, maplen, 806 0, maplen, DMA_TO_DEVICE);
807 PCI_DMA_TODEVICE);
808 elem = elem->next; 807 elem = elem->next;
809 elem->skb = NULL; 808 elem->skb = NULL;
810 elem->mapaddr = mapaddr; 809 elem->mapaddr = mapaddr;
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 96cb35a8e317..7cb7f292dfd1 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -445,7 +445,7 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev)
445 &skb_shinfo(skb)->frags[skb_fragment_index]; 445 &skb_shinfo(skb)->frags[skb_fragment_index];
446 bus_address = skb_frag_dma_map(&nesdev->pcidev->dev, 446 bus_address = skb_frag_dma_map(&nesdev->pcidev->dev,
447 frag, 0, frag->size, 447 frag, 0, frag->size,
448 PCI_DMA_TODEVICE); 448 DMA_TO_DEVICE);
449 wqe_fragment_length[wqe_fragment_index] = 449 wqe_fragment_length[wqe_fragment_index] =
450 cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size); 450 cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size);
451 set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index), 451 set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index),
@@ -566,7 +566,7 @@ tso_sq_no_longer_full:
566 tso_bus_address[tso_frag_count] = 566 tso_bus_address[tso_frag_count] =
567 skb_frag_dma_map(&nesdev->pcidev->dev, 567 skb_frag_dma_map(&nesdev->pcidev->dev,
568 frag, 0, frag->size, 568 frag, 0, frag->size,
569 PCI_DMA_TODEVICE); 569 DMA_TO_DEVICE);
570 } 570 }
571 571
572 tso_frag_index = 0; 572 tso_frag_index = 0;