Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / via / via-velocity.c

diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 086463b141b66194b1c51ad288cebf27dd03617e..4535d7cc848edb5a4d775c562e75eaae9b2032d2 100644 (file)
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2554,15 +2554,16 @@ static netdev_tx_t velocity_xmit(struct sk_buff *skb,
 
        /* Handle fragments */
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-               skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+               const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-               tdinfo->skb_dma[i + 1] = pci_map_page(vptr->pdev, frag->page,
-                               frag->page_offset, frag->size,
-                               PCI_DMA_TODEVICE);
+               tdinfo->skb_dma[i + 1] = skb_frag_dma_map(&vptr->pdev->dev,
+                                                         frag, 0,
+                                                         skb_frag_size(frag),
+                                                         DMA_TO_DEVICE);
 
                td_ptr->td_buf[i + 1].pa_low = cpu_to_le32(tdinfo->skb_dma[i + 1]);
                td_ptr->td_buf[i + 1].pa_high = 0;
-               td_ptr->td_buf[i + 1].size = cpu_to_le16(frag->size);
+               td_ptr->td_buf[i + 1].size = cpu_to_le16(skb_frag_size(frag));
        }
        tdinfo->nskb_dma = i + 1;