vmxnet3: convert to SKB paged frag API.
authorIan Campbell <Ian.Campbell@citrix.com>
Wed, 21 Sep 2011 21:53:28 +0000 (21:53 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2011 20:04:19 +0000 (16:04 -0400)
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>
drivers/net/vmxnet3/vmxnet3_drv.c

index 759c1a4..57e7c66 100644 (file)
@@ -654,7 +654,7 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,
 
        BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
 
-       frag->page = rbi->page;
+       __skb_frag_set_page(frag, rbi->page);
        frag->page_offset = 0;
        frag->size = rcd->len;
        skb->data_len += frag->size;
@@ -748,9 +748,9 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
 
                tbi = tq->buf_info + tq->tx_ring.next2fill;
                tbi->map_type = VMXNET3_MAP_PAGE;
-               tbi->dma_addr = pci_map_page(adapter->pdev, frag->page,
-                                            frag->page_offset, frag->size,
-                                            PCI_DMA_TODEVICE);
+               tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag,
+                                                0, frag->size,
+                                                PCI_DMA_TODEVICE);
 
                tbi->len = frag->size;