diff mbox

[net] Driver: Vmxnet3: segCnt can be 1 for LRO packets

Message ID 1465365317-120893-1-git-send-email-skhare@vmware.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Shrikrishna Khare June 8, 2016, 5:55 a.m. UTC 
The device emulation may send segCnt of 1 for LRO packets.

Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
Signed-off-by: Jin Heo <heoj@vmware.com>
---
 drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
 drivers/net/vmxnet3/vmxnet3_int.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

David Miller June 8, 2016, 5:59 a.m. UTC | #1 
From: Shrikrishna Khare <skhare@vmware.com>
Date: Tue,  7 Jun 2016 22:55:17 -0700

> The device emulation may send segCnt of 1 for LRO packets.
> 
> Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
> Signed-off-by: Jin Heo <heoj@vmware.com>

Please do not capitalize subsystem prefixes in your Subject line,
and "Driver: " is so generic that it's pointless to use it as a
part of the subsystem prefix.  Plain "vmxnet3: " is sufficient.
Shrikrishna Khare June 8, 2016, 6:16 a.m. UTC | #2 
On Tue, 7 Jun 2016, David Miller wrote:

> From: Shrikrishna Khare <skhare@vmware.com>
> Date: Tue,  7 Jun 2016 22:55:17 -0700
> 
> > The device emulation may send segCnt of 1 for LRO packets.
> > 
> > Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
> > Signed-off-by: Jin Heo <heoj@vmware.com>
> 
> Please do not capitalize subsystem prefixes in your Subject line,
> and "Driver: " is so generic that it's pointless to use it as a
> part of the subsystem prefix.  Plain "vmxnet3: " is sufficient.
> 

Ok. Sent v2 of the patch with the subject line fixed.
diff mbox

Patch

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index db8022a..6f399b2 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1369,7 +1369,7 @@  vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
 				rcdlro = (struct Vmxnet3_RxCompDescExt *)rcd;
 
 				segCnt = rcdlro->segCnt;
-				BUG_ON(segCnt <= 1);
+				BUG_ON(segCnt == 0);
 				mss = rcdlro->mss;
 				if (unlikely(segCnt <= 1))
 					segCnt = 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index c482539..3d2b64e 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.7.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.4.8.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01040700
+#define VMXNET3_DRIVER_VERSION_NUM      0x01040800
 
 #if defined(CONFIG_PCI_MSI)
 	/* RSS only makes sense if MSI-X is supported. */