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

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

intel: convert to SKB paged frag API. 



Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18324d69

drivers/net/ethernet/intel/e1000/e1000_main.c

+9 −7
Original line number Diff line number Diff line
@@ -2911,9 +2911,10 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 


		frag = &skb_shinfo(skb)->frags[f];

		len = frag->size;

		offset = frag->page_offset;

		offset = 0;



		while (len) {

			unsigned long bufend;

			i++;

			if (unlikely(i == tx_ring->count))

				i = 0;
@@ -2927,18 +2928,19 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
			/* Workaround for potential 82544 hang in PCI-X.

			 * Avoid terminating buffers within evenly-aligned

			 * dwords. */

			bufend = (unsigned long)

				page_to_phys(skb_frag_page(frag));

			bufend += offset + size - 1;

			if (unlikely(adapter->pcix_82544 &&

			    !((unsigned long)(page_to_phys(frag->page) + offset

			                      + size - 1) & 4) &&

				     !(bufend & 4) &&

				     size > 4))

				size -= 4;



			buffer_info->length = size;

			buffer_info->time_stamp = jiffies;

			buffer_info->mapped_as_page = true;

			buffer_info->dma = dma_map_page(&pdev->dev, frag->page,

							offset,	size,

							DMA_TO_DEVICE);

			buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,

						offset, size, DMA_TO_DEVICE);

			if (dma_mapping_error(&pdev->dev, buffer_info->dma))

				goto dma_error;

			buffer_info->next_to_watch = i;

drivers/net/ethernet/intel/e1000e/netdev.c

+3 −4
Original line number Diff line number Diff line
@@ -4677,7 +4677,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 


		frag = &skb_shinfo(skb)->frags[f];

		len = frag->size;

		offset = frag->page_offset;

		offset = 0;



		while (len) {

			i++;
@@ -4690,9 +4690,8 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
			buffer_info->length = size;

			buffer_info->time_stamp = jiffies;

			buffer_info->next_to_watch = i;

			buffer_info->dma = dma_map_page(&pdev->dev, frag->page,

							offset, size,

							DMA_TO_DEVICE);

			buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,

						offset, size, DMA_TO_DEVICE);

			buffer_info->mapped_as_page = true;

			if (dma_mapping_error(&pdev->dev, buffer_info->dma))

				goto dma_error;

drivers/net/ethernet/intel/igb/igb_main.c

+1 −4
Original line number Diff line number Diff line
@@ -4174,10 +4174,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb, 
		buffer_info->time_stamp = jiffies;

		buffer_info->next_to_watch = i;

		buffer_info->mapped_as_page = true;

		buffer_info->dma = dma_map_page(dev,

						frag->page,

						frag->page_offset,

						len,

		buffer_info->dma = skb_frag_dma_map(dev, frag, 0, len,

						DMA_TO_DEVICE);

		if (dma_mapping_error(dev, buffer_info->dma))

			goto dma_error;

drivers/net/ethernet/intel/igbvf/netdev.c

+1 −4
Original line number Diff line number Diff line
@@ -2061,10 +2061,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter, 
		buffer_info->time_stamp = jiffies;

		buffer_info->next_to_watch = i;

		buffer_info->mapped_as_page = true;

		buffer_info->dma = dma_map_page(&pdev->dev,

						frag->page,

						frag->page_offset,

						len,

		buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag, 0, len,

						DMA_TO_DEVICE);

		if (dma_mapping_error(&pdev->dev, buffer_info->dma))

			goto dma_error;

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -1341,7 +1341,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, 


		frag = &skb_shinfo(skb)->frags[f];

		len = frag->size;

		offset = frag->page_offset;

		offset = 0;



		while (len) {

			i++;
@@ -1361,8 +1361,8 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, 
			buffer_info->time_stamp = jiffies;

			buffer_info->mapped_as_page = true;

			buffer_info->dma =

				dma_map_page(&pdev->dev, frag->page,

					     offset, size, DMA_TO_DEVICE);

				skb_frag_dma_map(&pdev->dev, frag, offset, size,

						 DMA_TO_DEVICE);

			if (dma_mapping_error(&pdev->dev, buffer_info->dma))

				goto dma_error;

			buffer_info->next_to_watch = 0;