|
 |
7e0fe8 |
From ec247f951b02103202bdfa431f7cda1a42e1b009 Mon Sep 17 00:00:00 2001
|
|
|
7e0fe8 |
From: Ronak Doshi <doshir@vmware.com>
|
|
|
7e0fe8 |
Date: Fri, 16 Jul 2021 15:36:20 -0700
|
|
|
7e0fe8 |
Subject: [PATCH 1/7] vmxnet3: prepare for version 6 changes
|
|
|
7e0fe8 |
Git-commit: 69dbef0d1c22476c422ee255e99d0e112ddd829d
|
|
|
7e0fe8 |
Patch-mainline: v5.15-rc1
|
|
|
7e0fe8 |
References: bsc#1190406
|
|
|
7e0fe8 |
|
|
|
7e0fe8 |
vmxnet3 is currently at version 4 and this patch initiates the
|
|
|
7e0fe8 |
preparation to accommodate changes for upto version 6. Introduced
|
|
|
7e0fe8 |
utility macros for vmxnet3 version 6 comparison and update Copyright
|
|
|
7e0fe8 |
information.
|
|
|
7e0fe8 |
|
|
|
7e0fe8 |
Signed-off-by: Ronak Doshi <doshir@vmware.com>
|
|
|
7e0fe8 |
Acked-by: Guolin Yang <gyang@vmware.com>
|
|
|
7e0fe8 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
7e0fe8 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
7e0fe8 |
---
|
|
|
7e0fe8 |
drivers/net/vmxnet3/Makefile | 2 +-
|
|
|
7e0fe8 |
drivers/net/vmxnet3/upt1_defs.h | 2 +-
|
|
|
7e0fe8 |
drivers/net/vmxnet3/vmxnet3_defs.h | 2 +-
|
|
|
7e0fe8 |
drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
|
|
|
7e0fe8 |
drivers/net/vmxnet3/vmxnet3_int.h | 8 +++++++-
|
|
|
7e0fe8 |
5 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
7e0fe8 |
|
|
|
7e0fe8 |
diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile
|
|
|
7e0fe8 |
index c5a167a1c85c..7a38925f4165 100644
|
|
|
7e0fe8 |
--- a/drivers/net/vmxnet3/Makefile
|
|
|
7e0fe8 |
+++ b/drivers/net/vmxnet3/Makefile
|
|
|
7e0fe8 |
@@ -2,7 +2,7 @@
|
|
|
7e0fe8 |
#
|
|
|
7e0fe8 |
# Linux driver for VMware's vmxnet3 ethernet NIC.
|
|
|
7e0fe8 |
#
|
|
|
7e0fe8 |
-# Copyright (C) 2007-2020, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
+# Copyright (C) 2007-2021, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
#
|
|
|
7e0fe8 |
# This program is free software; you can redistribute it and/or modify it
|
|
|
7e0fe8 |
# under the terms of the GNU General Public License as published by the
|
|
|
7e0fe8 |
diff --git a/drivers/net/vmxnet3/upt1_defs.h b/drivers/net/vmxnet3/upt1_defs.h
|
|
|
7e0fe8 |
index 8c014c98471c..f9f3a23d1698 100644
|
|
|
7e0fe8 |
--- a/drivers/net/vmxnet3/upt1_defs.h
|
|
|
7e0fe8 |
+++ b/drivers/net/vmxnet3/upt1_defs.h
|
|
|
7e0fe8 |
@@ -1,7 +1,7 @@
|
|
|
7e0fe8 |
/*
|
|
|
7e0fe8 |
* Linux driver for VMware's vmxnet3 ethernet NIC.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
- * Copyright (C) 2008-2020, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
+ * Copyright (C) 2008-2021, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
* This program is free software; you can redistribute it and/or modify it
|
|
|
7e0fe8 |
* under the terms of the GNU General Public License as published by the
|
|
|
7e0fe8 |
diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
|
|
|
7e0fe8 |
index a8d5ebd47c71..ce76ebc376da 100644
|
|
|
7e0fe8 |
--- a/drivers/net/vmxnet3/vmxnet3_defs.h
|
|
|
7e0fe8 |
+++ b/drivers/net/vmxnet3/vmxnet3_defs.h
|
|
|
7e0fe8 |
@@ -1,7 +1,7 @@
|
|
|
7e0fe8 |
/*
|
|
|
7e0fe8 |
* Linux driver for VMware's vmxnet3 ethernet NIC.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
- * Copyright (C) 2008-2020, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
+ * Copyright (C) 2008-2021, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
* This program is free software; you can redistribute it and/or modify it
|
|
|
7e0fe8 |
* under the terms of the GNU General Public License as published by the
|
|
|
7e0fe8 |
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
|
|
|
7e0fe8 |
index 07bc56d33bcb..16762ab66a42 100644
|
|
|
7e0fe8 |
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
|
|
|
7e0fe8 |
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
|
|
|
7e0fe8 |
@@ -1,7 +1,7 @@
|
|
|
7e0fe8 |
/*
|
|
|
7e0fe8 |
* Linux driver for VMware's vmxnet3 ethernet NIC.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
- * Copyright (C) 2008-2020, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
+ * Copyright (C) 2008-2021, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
* This program is free software; you can redistribute it and/or modify it
|
|
|
7e0fe8 |
* under the terms of the GNU General Public License as published by the
|
|
|
7e0fe8 |
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
|
|
|
7e0fe8 |
index e910596b79cf..075c1f56aecc 100644
|
|
|
7e0fe8 |
--- a/drivers/net/vmxnet3/vmxnet3_int.h
|
|
|
7e0fe8 |
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
|
|
|
7e0fe8 |
@@ -1,7 +1,7 @@
|
|
|
7e0fe8 |
/*
|
|
|
7e0fe8 |
* Linux driver for VMware's vmxnet3 ethernet NIC.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
- * Copyright (C) 2008-2020, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
+ * Copyright (C) 2008-2021, VMware, Inc. All Rights Reserved.
|
|
|
7e0fe8 |
*
|
|
|
7e0fe8 |
* This program is free software; you can redistribute it and/or modify it
|
|
|
7e0fe8 |
* under the terms of the GNU General Public License as published by the
|
|
|
7e0fe8 |
@@ -81,6 +81,8 @@
|
|
|
7e0fe8 |
#define VMXNET3_RSS
|
|
|
7e0fe8 |
#endif
|
|
|
7e0fe8 |
|
|
|
7e0fe8 |
+#define VMXNET3_REV_6 5 /* Vmxnet3 Rev. 6 */
|
|
|
7e0fe8 |
+#define VMXNET3_REV_5 4 /* Vmxnet3 Rev. 5 */
|
|
|
7e0fe8 |
#define VMXNET3_REV_4 3 /* Vmxnet3 Rev. 4 */
|
|
|
7e0fe8 |
#define VMXNET3_REV_3 2 /* Vmxnet3 Rev. 3 */
|
|
|
7e0fe8 |
#define VMXNET3_REV_2 1 /* Vmxnet3 Rev. 2 */
|
|
|
7e0fe8 |
@@ -421,6 +423,10 @@ struct vmxnet3_adapter {
|
|
|
7e0fe8 |
(adapter->version >= VMXNET3_REV_3 + 1)
|
|
|
7e0fe8 |
#define VMXNET3_VERSION_GE_4(adapter) \
|
|
|
7e0fe8 |
(adapter->version >= VMXNET3_REV_4 + 1)
|
|
|
7e0fe8 |
+#define VMXNET3_VERSION_GE_5(adapter) \
|
|
|
7e0fe8 |
+ (adapter->version >= VMXNET3_REV_5 + 1)
|
|
|
7e0fe8 |
+#define VMXNET3_VERSION_GE_6(adapter) \
|
|
|
7e0fe8 |
+ (adapter->version >= VMXNET3_REV_6 + 1)
|
|
|
7e0fe8 |
|
|
|
7e0fe8 |
/* must be a multiple of VMXNET3_RING_SIZE_ALIGN */
|
|
|
7e0fe8 |
#define VMXNET3_DEF_TX_RING_SIZE 512
|
|
|
7e0fe8 |
--
|
|
|
7e0fe8 |
2.16.4
|
|
|
7e0fe8 |
|