All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shrikrishna Khare <skhare@vmware.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	pv-drivers@vmware.com
Cc: Shrikrishna Khare <skhare@vmware.com>
Subject: [PATCH net-next v4 7/7] vmxnet3: update to version 3
Date: Tue, 14 Jun 2016 11:52:28 -0700	[thread overview]
Message-ID: <1465930348-92164-8-git-send-email-skhare@vmware.com> (raw)
In-Reply-To: <1465930348-92164-1-git-send-email-skhare@vmware.com>

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

  parent reply	other threads:[~2016-06-14 18:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-14 18:52 [PATCH net-next v4 0/7] vmxnet3: upgrade to version 3 Shrikrishna Khare
2016-06-14 18:52 ` [PATCH net-next v4 1/7] vmxnet3: prepare for version 3 changes Shrikrishna Khare
2016-06-14 18:52 ` [PATCH net-next v4 2/7] vmxnet3: introduce generic command interface to configure the device Shrikrishna Khare
2016-06-14 18:52 ` [PATCH net-next v4 3/7] vmxnet3: allow variable length transmit data ring buffer Shrikrishna Khare
2016-06-14 18:52 ` [PATCH net-next v4 4/7] vmxnet3: add receive data ring support Shrikrishna Khare
2016-06-14 18:52 ` [PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations Shrikrishna Khare
2016-06-14 19:38   ` Ben Hutchings
2016-06-14 18:52 ` [PATCH net-next v4 6/7] vmxnet3: introduce command to register memory region Shrikrishna Khare
2016-06-14 18:52 ` Shrikrishna Khare [this message]
2016-06-14 20:22 ` [PATCH net-next v4 0/7] vmxnet3: upgrade to version 3 Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465930348-92164-8-git-send-email-skhare@vmware.com \
    --to=skhare@vmware.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pv-drivers@vmware.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.