Commit b7b6a688 authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller

bnx2: convert to SKB paged frag API.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Michael Chan <mchan@broadcom.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc234d0b
...@@ -2930,8 +2930,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, ...@@ -2930,8 +2930,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
shinfo = skb_shinfo(skb); shinfo = skb_shinfo(skb);
shinfo->nr_frags--; shinfo->nr_frags--;
page = shinfo->frags[shinfo->nr_frags].page; page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);
shinfo->frags[shinfo->nr_frags].page = NULL; __skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);
cons_rx_pg->page = page; cons_rx_pg->page = page;
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -6511,8 +6511,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -6511,8 +6511,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
txbd = &txr->tx_desc_ring[ring_prod]; txbd = &txr->tx_desc_ring[ring_prod];
len = frag->size; len = frag->size;
mapping = dma_map_page(&bp->pdev->dev, frag->page, frag->page_offset, mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len,
len, PCI_DMA_TODEVICE); PCI_DMA_TODEVICE);
if (dma_mapping_error(&bp->pdev->dev, mapping)) if (dma_mapping_error(&bp->pdev->dev, mapping))
goto dma_error; goto dma_error;
dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping, dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment