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

Commit 0bdc0d70 authored by Shreyas Bhatewara's avatar Shreyas Bhatewara Committed by David S. Miller
Browse files

net-next: vmxnet3 fixes [5/5] Respect the interrupt type in VM configuration 



Respect the interrupt type set in VM configuration.

When interrupt type is not auto, do not ignore the interrupt type set from
VM configuration.

Signed-off-by: default avatarShreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9a5f210

drivers/net/vmxnet3/vmxnet3_drv.c

+10 −3
Original line number Diff line number Diff line
@@ -2302,9 +2302,13 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) 
	adapter->intr.mask_mode = (cfg >> 2) & 0x3;



	if (adapter->intr.type == VMXNET3_IT_AUTO) {

		int err;

		adapter->intr.type = VMXNET3_IT_MSIX;

	}



#ifdef CONFIG_PCI_MSI

	if (adapter->intr.type == VMXNET3_IT_MSIX) {

		int err;



		adapter->intr.msix_entries[0].entry = 0;

		err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,

				      VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2313,15 +2317,18 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) 
			adapter->intr.type = VMXNET3_IT_MSIX;

			return;

		}

#endif

		adapter->intr.type = VMXNET3_IT_MSI;

	}



	if (adapter->intr.type == VMXNET3_IT_MSI) {

		int err;

		err = pci_enable_msi(adapter->pdev);

		if (!err) {

			adapter->intr.num_intrs = 1;

			adapter->intr.type = VMXNET3_IT_MSI;

			return;

		}

	}

#endif /* CONFIG_PCI_MSI */



	adapter->intr.type = VMXNET3_IT_INTX;

drivers/net/vmxnet3/vmxnet3_int.h

+2 −2
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ 
/*

 * Version numbers

 */

#define VMXNET3_DRIVER_VERSION_STRING   "1.0.5.0-k"

#define VMXNET3_DRIVER_VERSION_STRING   "1.0.13.0-k"



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

#define VMXNET3_DRIVER_VERSION_NUM      0x01000500

#define VMXNET3_DRIVER_VERSION_NUM      0x01000B00





/*