Changes to common source files not directly applicable to open-vm-tools.

diff --git a/open-vm-tools/modules/shared/vmxnet/upt1_defs.h b/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
index 85cbfd8e06ea64cfc8beb1baad4c5277a72ef671..f16e73b4ff8c573ab61c854cfe97d17504275377 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2020 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
@@ -94,13 +94,19 @@ UPT1_RxStats;
 #define UPT1_RSS_HASH_TYPE_IPV6      0x04
 #define UPT1_RSS_HASH_TYPE_TCP_IPV6  0x08
 
-#define UPT1_RSS_HASH_FUNC_NONE      0x0
-#define UPT1_RSS_HASH_FUNC_TOEPLITZ  0x01
+typedef enum {
+   UPT1_RSS_HASH_FUNC_NONE      = 0x0000,
+   UPT1_RSS_HASH_FUNC_TOEPLITZ  = 0x0001,
+   UPT1_RSS_HASH_FUNC_CRC32     = 0x0002,
+
+   //upper bound on max hash functions supported
+   UPT1_RSS_HASH_FUNC_MAX       = 0xFFFF
+} Vmxnet3_RSSHashFunc;
 
 #define UPT1_RSS_MAX_KEY_SIZE        40
 #define UPT1_RSS_MAX_IND_TABLE_SIZE  128
 
-typedef 
+typedef
 #include "vmware_pack_begin.h"
 struct UPT1_RSSConf {
    uint16   hashType;

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
index 4b84748842cee32a087b878005f522a64f15355d..81a7899f1a713cd5bd42adf3fc45abec52681a7b 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-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2020 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
@@ -144,6 +144,7 @@ typedef enum {
    VMXNET3_CMD_GET_ENCAP_DSTPORT,
    VMXNET3_CMD_GET_PKTSTEERING, /* 0xF00D000E */
    VMXNET3_CMD_GET_MAX_QUEUES_CONF,
+   VMXNET3_CMD_GET_RSS_HASH_FUNC,
 } Vmxnet3_Cmd;
 
 /* Adaptive Ring Info Flags */