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

Commit 0e15df49 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: minor whitespace and indentation cleanup 



Cleanup of some whitespace and indentation of a single code block.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e885d762

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

+41 −35
Original line number Diff line number Diff line
@@ -1268,15 +1268,16 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, 


		{

			/*

		 * this looks ugly, but it seems compiler issues make it

		 * more efficient than reusing j

			 * this looks ugly, but it seems compiler issues make

			 * it more efficient than reusing j

			 */

			int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);



			/*

		 * page alloc/put takes too long and effects small packet

		 * throughput, so unsplit small packets and save the alloc/put

		 * only valid in softirq (napi) context to call kmap_*

			 * page alloc/put takes too long and effects small

			 * packet throughput, so unsplit small packets and

			 * save the alloc/put only valid in softirq (napi)

			 * context to call kmap_*

			 */

			if (l1 && (l1 <= copybreak) &&

			    ((length + l1) <= adapter->rx_ps_bsize0)) {
@@ -1289,13 +1290,18 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, 
				 * kmap_atomic, so we can't hold the mapping

				 * very long

				 */

			dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,

						PAGE_SIZE, DMA_FROM_DEVICE);

			vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);

				dma_sync_single_for_cpu(&pdev->dev,

							ps_page->dma,

							PAGE_SIZE,

							DMA_FROM_DEVICE);

				vaddr = kmap_atomic(ps_page->page,

						    KM_SKB_DATA_SOFTIRQ);

				memcpy(skb_tail_pointer(skb), vaddr, l1);

				kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);

			dma_sync_single_for_device(&pdev->dev, ps_page->dma,

						   PAGE_SIZE, DMA_FROM_DEVICE);

				dma_sync_single_for_device(&pdev->dev,

							   ps_page->dma,

							   PAGE_SIZE,

							   DMA_FROM_DEVICE);



				/* remove the CRC */

				if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))

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

+2 −2

File changed.

Contains only whitespace changes.