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

Commit 6af9d787 authored by Shrikrishna Khare's avatar Shrikrishna Khare Committed by David S. Miller
Browse files

vmxnet3: update to version 3 



With all vmxnet3 version 3 changes incorporated in the vmxnet3 driver,
the driver can configure emulation to run at vmxnet3 version 3, provided
the emulation advertises support for version 3.

Signed-off-by: default avatarShrikrishna Khare <skhare@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47443222

drivers/net/vmxnet3/vmxnet3_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -3345,7 +3345,12 @@ vmxnet3_probe_device(struct pci_dev *pdev, 
		goto err_alloc_pci;



	ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS);

	if (ver & (1 << VMXNET3_REV_2)) {

	if (ver & (1 << VMXNET3_REV_3)) {

		VMXNET3_WRITE_BAR1_REG(adapter,

				       VMXNET3_REG_VRRS,

				       1 << VMXNET3_REV_3);

		adapter->version = VMXNET3_REV_3 + 1;

	} else if (ver & (1 << VMXNET3_REV_2)) {

		VMXNET3_WRITE_BAR1_REG(adapter,

				       VMXNET3_REG_VRRS,

				       1 << VMXNET3_REV_2);

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.8.0-k"

#define VMXNET3_DRIVER_VERSION_STRING   "1.4.9.0-k"



/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */

#define VMXNET3_DRIVER_VERSION_NUM      0x01040800

#define VMXNET3_DRIVER_VERSION_NUM      0x01040900



#if defined(CONFIG_PCI_MSI)

	/* RSS only makes sense if MSI-X is supported. */