Commit a31135e3 authored by Ronak Doshi's avatar Ronak Doshi Committed by David S. Miller
Browse files

vmxnet3: update to version 4 



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

Signed-off-by: default avatarRonak Doshi <doshir@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dacce2be

drivers/net/vmxnet3/vmxnet3_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -3492,7 +3492,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_3)) {

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

		VMXNET3_WRITE_BAR1_REG(adapter,

				       VMXNET3_REG_VRRS,

				       1 << VMXNET3_REV_4);

		adapter->version = VMXNET3_REV_4 + 1;

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

		VMXNET3_WRITE_BAR1_REG(adapter,

				       VMXNET3_REG_VRRS,

				       1 << VMXNET3_REV_3);

drivers/net/vmxnet3/vmxnet3_int.h

+2 −2
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ 
/*

 * Version numbers

 */

#define VMXNET3_DRIVER_VERSION_STRING   "1.4.17.0-k"

#define VMXNET3_DRIVER_VERSION_STRING   "1.5.0.0-k"



/* Each byte of this 32-bit integer encodes a version number in

 * VMXNET3_DRIVER_VERSION_STRING.

 */

#define VMXNET3_DRIVER_VERSION_NUM      0x01041100

#define VMXNET3_DRIVER_VERSION_NUM      0x01050000



#if defined(CONFIG_PCI_MSI)

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE