enic: convert to SKB paged frag API.

(cherry picked from commit 4bf5adbf757565d2cc19758aec8452e5364dd700)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Vasanthy Kolluri <vkolluri@cisco.com>
Cc: Roopa Prabhu <roprabhu@cisco.com>
Cc: David Wang <dwang2@cisco.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 03bb333c20fcd615216ff4056c80c36a8ffced4e..4f66f3f2a9263896cf3e88a4dbcd3e59e8dde4ab 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -594,9 +594,9 @@ static inline void enic_queue_wq_skb_cont(struct enic *enic,
        for (frag = skb_shinfo(skb)->frags; len_left; frag++) {
                len_left -= frag->size;
                enic_queue_wq_desc_cont(wq, skb,
-                       pci_map_page(enic->pdev, frag->page,
-                               frag->page_offset, frag->size,
-                               PCI_DMA_TODEVICE),
+                       skb_frag_dma_map(&enic->pdev->dev,
+                                        frag, 0, frag->size,
+                                        PCI_DMA_TODEVICE),
                        frag->size,
                        (len_left == 0),        /* EOP? */
                        loopback);
@@ -708,14 +708,14 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic,
        for (frag = skb_shinfo(skb)->frags; len_left; frag++) {
                len_left -= frag->size;
                frag_len_left = frag->size;
-               offset = frag->page_offset;
+               offset = 0;
 
                while (frag_len_left) {
                        len = min(frag_len_left,
                                (unsigned int)WQ_ENET_MAX_DESC_LEN);
-                       dma_addr = pci_map_page(enic->pdev, frag->page,
-                               offset, len,
-                               PCI_DMA_TODEVICE);
+                       dma_addr = skb_frag_dma_map(&enic->pdev->dev, frag,
+                                                   offset, len,
+                                                   PCI_DMA_TODEVICE);
                        enic_queue_wq_desc_cont(wq, skb,
                                dma_addr,
                                len,