Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1422225
| From | Shrikrishna Khare <skhare@vmware.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v4 7/7] vmxnet3: update to version 3 |
| Date | 2016-06-14 21:00 +0200 |
| Message-ID | <rK1J7-fP-9@gated-at.bofh.it> (permalink) |
| References | <rK1J7-fP-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_drv.c | 7 ++++++-
drivers/net/vmxnet3/vmxnet3_int.h | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d0bcc1d9..c68fe49 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -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);
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 63df4f2..74fc030 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -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. */
--
2.8.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next v4 0/7] vmxnet3: upgrade to version 3 Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 7/7] vmxnet3: update to version 3 Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 1/7] vmxnet3: prepare for version 3 changes Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 4/7] vmxnet3: add receive data ring support Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 2/7] vmxnet3: introduce generic command interface to configure the device Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 3/7] vmxnet3: allow variable length transmit data ring buffer Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 6/7] vmxnet3: introduce command to register memory region Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
[PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations Shrikrishna Khare <skhare@vmware.com> - 2016-06-14 21:00 +0200
Re: [PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 21:40 +0200
Re: [PATCH net-next v4 0/7] vmxnet3: upgrade to version 3 Florian Fainelli <f.fainelli@gmail.com> - 2016-06-14 22:30 +0200
csiph-web