bnx2: convert to SKB paged frag API.

(cherry picked from commit b7b6a688d217936459ff5cf1087b2361db952509)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Michael Chan <mchan@broadcom.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/bnx2.c b/drivers/net/bnx2.c
index 6ae738f11eb826aaee75b1ac1e8cc5e288c36e59..929cb60794532bf381a16bd5542e354680360de7 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2921,8 +2921,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
 
                shinfo = skb_shinfo(skb);
                shinfo->nr_frags--;
-               page = shinfo->frags[shinfo->nr_frags].page;
-               shinfo->frags[shinfo->nr_frags].page = NULL;
+               page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);
+               __skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);
 
                cons_rx_pg->page = page;
                dev_kfree_skb(skb);
@@ -6545,8 +6545,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
                txbd = &txr->tx_desc_ring[ring_prod];
 
                len = frag->size;
-               mapping = dma_map_page(&bp->pdev->dev, frag->page, frag->page_offset,
-                                      len, PCI_DMA_TODEVICE);
+               mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len,
+                                          PCI_DMA_TODEVICE);
                if (dma_mapping_error(&bp->pdev->dev, mapping))
                        goto dma_error;
                dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping,