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/sun | |
| 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/sun')
| -rw-r--r-- | drivers/net/ethernet/sun/cassini.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/sun/sungem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 12068219059a..d9460d81a137 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -2830,7 +2830,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, len = fragp->size; mapping = skb_frag_dma_map(&cp->pdev->dev, fragp, 0, len, - PCI_DMA_TODEVICE); + DMA_TO_DEVICE); tabort = cas_calc_tabort(cp, fragp->page_offset, len); if (unlikely(tabort)) { diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 2bfa1715fe23..6b62a73227c2 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -1072,7 +1072,7 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb, len = this_frag->size; mapping = skb_frag_dma_map(&gp->pdev->dev, this_frag, - 0, len, PCI_DMA_TODEVICE); + 0, len, DMA_TO_DEVICE); this_ctrl = ctrl; if (frag == skb_shinfo(skb)->nr_frags - 1) this_ctrl |= TXDCTRL_EOF; |