lib/include/vm_assert.h:

  - Remove unused ASSERT_* macros.

modules/shared/vmxnet/vmnet_def.h:
  - Fix definition mismatch of VMNET_CAP_RX_LRO and VMK_PORT_CLIENT_CAP_HW_DCB.

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index b2ca2d42466a042902360b79f414a6cf1f9aaeb4..1d25662633de12126017b04268cc97199c4b4387 100644 (file)
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -204,8 +204,6 @@ void WarningThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);
 
 #define ASSERT_NOT_IMPLEMENTED(cond) \
            ASSERT_IFNOT(cond, NOT_IMPLEMENTED())
-#define ASSERT_NOT_IMPLEMENTED_BUG(bug, cond) \
-           ASSERT_IFNOT(cond, NOT_IMPLEMENTED_BUG(bug))
 
 #if defined VMKPANIC || defined VMM
 #define NOT_IMPLEMENTED()        _ASSERT_PANIC_NORETURN(AssertNotImplemented)

diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
index fa9915f39fd8b6b0192e306b0799706b56ee4473..1c4419df97d7b9316c5d497b8267059383693318 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
@@ -114,8 +114,8 @@
 #define VMNET_CAP_MESSAGE_LEVEL        CONST64U(0x20000000000000)   /* Uplink supports getting and setting message level. */
 #define VMNET_CAP_RING_PARAMS          CONST64U(0x40000000000000)   /* Support getting/setting RX/TX ring size parameters */
 #define VMNET_CAP_ADVERTISE_MODES      CONST64U(0x80000000000000)   /* Support getting/setting interconnect modes */
-#define VMNET_CAP_RX_SW_LRO            CONST64U(0x100000000000000)  /* Suppport SW LRO */
-#define VMNET_CAP_HW_DCB               CONST64U(0x200000000000000)  /* DCB capability in hardware */
+#define VMNET_CAP_HW_DCB               CONST64U(0x100000000000000)  /* DCB capability in hardware */
+#define VMNET_CAP_RX_SW_LRO            CONST64U(0x200000000000000)  /* Suppport SW LRO */
 #define VMNET_CAP_LEGACY               CONST64U(0x8000000000000000) /* Uplink is compatible with vmklinux drivers */
 
 #endif // _VMNET_DEF_H_