aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
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/net/ethernet/neterion
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/neterion')
-rw-r--r--drivers/net/ethernet/neterion/s2io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index ef5b825a9a9..4ec7e3f46cc 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -4193,7 +4193,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
4193 txdp->Buffer_Pointer = (u64)skb_frag_dma_map(&sp->pdev->dev, 4193 txdp->Buffer_Pointer = (u64)skb_frag_dma_map(&sp->pdev->dev,
4194 frag, 0, 4194 frag, 0,
4195 frag->size, 4195 frag->size,
4196 PCI_DMA_TODEVICE); 4196 DMA_TO_DEVICE);
4197 txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); 4197 txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
4198 if (offload_type == SKB_GSO_UDP) 4198 if (offload_type == SKB_GSO_UDP)
4199 txdp->Control_1 |= TXD_UFO_EN; 4199 txdp->Control_1 |= TXD_UFO_EN;