From: Ian Campbell Date: Wed, 5 Oct 2011 21:35:34 +0000 (-0400) Subject: vxge: convert to SKB paged frag API. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94d60a7bc700f50720286e423ab1540ffedd5c15;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git vxge: convert to SKB paged frag API. [ Use DMA_TO_DEVICE and dma_mapping_error() -DaveM ] Signed-off-by: Ian Campbell Cc: Jon Mason Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index ef1ba204bc59..a66f8fc0401e 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -923,11 +923,11 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) if (!frag->size) continue; - dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + dma_pointer = (u64)skb_frag_dma_map(&fifo->pdev->dev, frag, + 0, frag->size, + DMA_TO_DEVICE); - if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) + if (unlikely(dma_mapping_error(&fifo->pdev->dev, dma_pointer))) goto _exit2; vxge_debug_tx(VXGE_TRACE, "%s: %s:%d frag = %d dma_pointer = 0x%llx",