aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2011-09-21 17:53:28 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-22 16:04:19 -0400
commit0e0634d20dd670a89af19af2a686a6cce943ac14 (patch)
tree6b34ce1fb04e2fffc4f213d3efae32b2e1411eb3 /drivers/net/vmxnet3
parent86ee8130a46769f73f8f423f99dbf782a09f9233 (diff)
vmxnet3: convert to SKB paged frag API.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Shreyas Bhatewara <sbhatewara@vmware.com> Cc: "VMware, Inc." <pv-drivers@vmware.com> Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 759c1a49cc7b..57e7c66a9057 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -654,7 +654,7 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,
654 654
655 BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS); 655 BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
656 656
657 frag->page = rbi->page; 657 __skb_frag_set_page(frag, rbi->page);
658 frag->page_offset = 0; 658 frag->page_offset = 0;
659 frag->size = rcd->len; 659 frag->size = rcd->len;
660 skb->data_len += frag->size; 660 skb->data_len += frag->size;
@@ -748,9 +748,9 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
748 748
749 tbi = tq->buf_info + tq->tx_ring.next2fill; 749 tbi = tq->buf_info + tq->tx_ring.next2fill;
750 tbi->map_type = VMXNET3_MAP_PAGE; 750 tbi->map_type = VMXNET3_MAP_PAGE;
751 tbi->dma_addr = pci_map_page(adapter->pdev, frag->page, 751 tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag,
752 frag->page_offset, frag->size, 752 0, frag->size,
753 PCI_DMA_TODEVICE); 753 PCI_DMA_TODEVICE);
754 754
755 tbi->len = frag->size; 755 tbi->len = frag->size;
756 756