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/chelsio | |
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/chelsio')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/sge.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c index 7cde425f2b8..0a511c4a047 100644 --- a/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb/sge.c | |||
@@ -1278,7 +1278,7 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb, | |||
1278 | } | 1278 | } |
1279 | 1279 | ||
1280 | mapping = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, | 1280 | mapping = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, |
1281 | frag->size, PCI_DMA_TODEVICE); | 1281 | frag->size, DMA_TO_DEVICE); |
1282 | desc_mapping = mapping; | 1282 | desc_mapping = mapping; |
1283 | desc_len = frag->size; | 1283 | desc_len = frag->size; |
1284 | 1284 | ||
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index a0baaa09f02..2f46b37e5d1 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c | |||
@@ -980,7 +980,7 @@ static inline unsigned int make_sgl(const struct sk_buff *skb, | |||
980 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 980 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
981 | 981 | ||
982 | mapping = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, | 982 | mapping = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, |
983 | PCI_DMA_TODEVICE); | 983 | DMA_TO_DEVICE); |
984 | sgp->len[j] = cpu_to_be32(frag->size); | 984 | sgp->len[j] = cpu_to_be32(frag->size); |
985 | sgp->addr[j] = cpu_to_be64(mapping); | 985 | sgp->addr[j] = cpu_to_be64(mapping); |
986 | j ^= 1; | 986 | j ^= 1; |