diff options
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 3 | ||||
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index c0da23096160..fa6e2ac7475a 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
| @@ -2884,6 +2884,9 @@ vmxnet3_probe_device(struct pci_dev *pdev, | |||
| 2884 | int num_tx_queues; | 2884 | int num_tx_queues; |
| 2885 | int num_rx_queues; | 2885 | int num_rx_queues; |
| 2886 | 2886 | ||
| 2887 | if (!pci_msi_enabled()) | ||
| 2888 | enable_mq = 0; | ||
| 2889 | |||
| 2887 | #ifdef VMXNET3_RSS | 2890 | #ifdef VMXNET3_RSS |
| 2888 | if (enable_mq) | 2891 | if (enable_mq) |
| 2889 | num_rx_queues = min(VMXNET3_DEVICE_MAX_RX_QUEUES, | 2892 | num_rx_queues = min(VMXNET3_DEVICE_MAX_RX_QUEUES, |
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 8ba7b5f67de2..f50d36fdf405 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h | |||
| @@ -68,10 +68,10 @@ | |||
| 68 | /* | 68 | /* |
| 69 | * Version numbers | 69 | * Version numbers |
| 70 | */ | 70 | */ |
| 71 | #define VMXNET3_DRIVER_VERSION_STRING "1.0.25.0-k" | 71 | #define VMXNET3_DRIVER_VERSION_STRING "1.1.9.0-k" |
| 72 | 72 | ||
| 73 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ | 73 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ |
| 74 | #define VMXNET3_DRIVER_VERSION_NUM 0x01001900 | 74 | #define VMXNET3_DRIVER_VERSION_NUM 0x01010900 |
| 75 | 75 | ||
| 76 | #if defined(CONFIG_PCI_MSI) | 76 | #if defined(CONFIG_PCI_MSI) |
| 77 | /* RSS only makes sense if MSI-X is supported. */ | 77 | /* RSS only makes sense if MSI-X is supported. */ |
