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

Commit 58caf637 authored Jan 06, 2016 by Shrikrishna Khare Committed by David S. Miller Jan 06, 2016

Driver: Vmxnet3: Fix regression caused by 5738a09d



Reported-by: Bingkuo Liu <bingkuol@vmware.com>
Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e439bd4a

drivers/net/vmxnet3/vmxnet3_drv.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1380,8 +1380,8 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
		skip_page_frags = true;
		goto rcd_done;
		}
		new_dma_addr = dma_map_page(&adapter->pdev->dev
		, rbi->page,
		new_dma_addr = dma_map_page(&adapter->pdev->dev,
		new_page,
		0, PAGE_SIZE,
		PCI_DMA_FROMDEVICE);
		if (dma_mapping_error(&adapter->pdev->dev,

drivers/net/vmxnet3/vmxnet3_int.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,10 +69,10 @@
		/*
		* Version numbers
		*/
		#define VMXNET3_DRIVER_VERSION_STRING "1.4.4.0-k"
		#define VMXNET3_DRIVER_VERSION_STRING "1.4.5.0-k"

		/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
		#define VMXNET3_DRIVER_VERSION_NUM 0x01040400
		#define VMXNET3_DRIVER_VERSION_NUM 0x01040500

		#if defined(CONFIG_PCI_MSI)
		/* RSS only makes sense if MSI-X is supported. */