Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/broadcom/bnx2.c

+4 −4
Original line number Diff line number Diff line
@@ -2930,8 +2930,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);
@@ -6511,8 +6511,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,