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

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

sky2: convert to SKB paged frag API. 



Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 516733c2

drivers/net/ethernet/marvell/sky2.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -1226,8 +1226,7 @@ static int sky2_rx_map_skb(struct pci_dev *pdev, struct rx_ring_info *re, 
	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];





		re->frag_addr[i] = pci_map_page(pdev, frag->page,

		re->frag_addr[i] = skb_frag_dma_map(&pdev->dev, frag, 0,

						frag->page_offset,

						    frag->size,

						    frag->size,

						    PCI_DMA_FROMDEVICE);

						    PCI_DMA_FROMDEVICE);
@@ -1910,7 +1909,7 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb, 
	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

		const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];





		mapping = pci_map_page(hw->pdev, frag->page, frag->page_offset,

		mapping = skb_frag_dma_map(&hw->pdev->dev, frag, 0,

					   frag->size, PCI_DMA_TODEVICE);

					   frag->size, PCI_DMA_TODEVICE);





		if (pci_dma_mapping_error(hw->pdev, mapping))

		if (pci_dma_mapping_error(hw->pdev, mapping))
@@ -2449,7 +2448,7 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space, 




		if (length == 0) {

		if (length == 0) {

			/* don't need this page */

			/* don't need this page */

			__free_page(frag->page);

			__skb_frag_unref(frag);

			--skb_shinfo(skb)->nr_frags;

			--skb_shinfo(skb)->nr_frags;

		} else {

		} else {

			size = min(length, (unsigned) PAGE_SIZE);

			size = min(length, (unsigned) PAGE_SIZE);