Common header file change not applicable to open-vm-tools.

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
index 4e73de834d606805d7f5d978f4125e29c0a74de5..df5c60b8d1976f1aec5b0f5b9fdb86baa84b4dea 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2021 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -79,12 +79,12 @@
 #define VMXNET3_REG_RXPROD2  0xA00 /* Rx Producer Index for ring 2 */
 
 /* For Large PT BAR, the following offset to DB register */
-#define VMXNET3_REG_LB_TXPROD   0x1000 /* Tx Producer Index */
-#define VMXNET3_REG_LB_RXPROD   0x1400 /* Rx Producer Index for ring 1 */
-#define VMXNET3_REG_LB_RXPROD2  0x1800 /* Rx Producer Index for ring 2 */
+#define VMXNET3_REG_LB_TXPROD    (PAGE_SIZE)           /* Tx Producer Index */
+#define VMXNET3_REG_LB_RXPROD    ((PAGE_SIZE) + 0x400) /* Rx Producer Index for ring 1 */
+#define VMXNET3_REG_LB_RXPROD2   ((PAGE_SIZE) + 0x800) /* Rx Producer Index for ring 2 */
 
 #define VMXNET3_PT_REG_SIZE     4096    /* BAR 0 */
-#define VMXNET3_LARGE_PT_REG_SIZE  8192  /* large PT pages */
+#define VMXNET3_LARGE_PT_REG_SIZE  (2 * (PAGE_SIZE))  /* large PT pages */
 #define VMXNET3_VD_REG_SIZE     4096    /* BAR 1 */
 #define VMXNET3_LARGE_BAR0_REG_SIZE (4096 * 4096)  /* LARGE BAR 0 */
 #define VMXNET3_OOB_REG_SIZE  (4094 * 4096) /* OOB pages */
@@ -98,8 +98,6 @@
  * -------------------------------------------------------------------------
  * VMXNET3_MSIX_BAR_SIZE is defined in "vmxnet3Int.h"
  */
-#define VMXNET3_PHYSMEM_PAGES   4
-#define VMXNET3_PHYSMEM_LB_PAGES 4099 /* 4096 + 1 + 2 */
 
 #define VMXNET3_REG_ALIGN       8  /* All registers are 8-byte aligned. */
 #define VMXNET3_REG_ALIGN_MASK  0x7