From df022a0962a14a1632981dbea0c70bda4f4f85f8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 5 Oct 2011 17:35:34 -0400 Subject: [PATCH] --- yaml --- r: 266431 b: refs/heads/master c: 94d60a7bc700f50720286e423ab1540ffedd5c15 h: refs/heads/master i: 266429: 45d5596bb2b411e63e4a26e28769a7a3cc4e1627 266427: db20eabffc602ce86edbf787ef1226e24b20ea97 266423: 509f2728eba05efe8cbfdcc2b12a71eada6c89b5 266415: 97fca5bb94b7ae199c6ab50a9a49b89a7c1f4373 266399: e65a63824db56b7fe44e4149f1e8a8d221d88fd2 266367: 80fcd03fef8fc1d4dff0afc43eae96486454b26f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/neterion/vxge/vxge-main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e4572b03a368..5d6f497d61bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e7307fc7b24120dcf795dd1b21fdc6286c48b4c +refs/heads/master: 94d60a7bc700f50720286e423ab1540ffedd5c15 diff --git a/trunk/drivers/net/ethernet/neterion/vxge/vxge-main.c b/trunk/drivers/net/ethernet/neterion/vxge/vxge-main.c index ef1ba204bc59..a66f8fc0401e 100644 --- a/trunk/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/trunk/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",