From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:28 +0000 (+0000) Subject: vmxnet3: convert to SKB paged frag API. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0e0634d20dd670a89af19af2a686a6cce943ac14;p=openwrt%2Fstaging%2Fblogic.git vmxnet3: convert to SKB paged frag API. Signed-off-by: Ian Campbell Cc: Shreyas Bhatewara Cc: "VMware, Inc." Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller --- 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, 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;