Changes to common header files not applicable to open-vm-tools

diff --git a/open-vm-tools/lib/include/vm_legal.h b/open-vm-tools/lib/include/vm_legal.h
index 777a8bbc6f7dabf3c3a4c5276e3ddeb5668e4eca..34100564cf2c3fbda9a6b25c72fcbd51748f5275 100644 (file)
--- a/open-vm-tools/lib/include/vm_legal.h
+++ b/open-vm-tools/lib/include/vm_legal.h
@@ -33,12 +33,13 @@
 
 
 /*
- * The following strings may be incorporated into MSGID strings.  Updating
- * them therefore may require updating translations and vmsg auditing files.
+ * NOTE: The following strings may be incorporated into MSGID strings.
+ * Updating them therefore may require updating translations and vmsg
+ * auditing files in bora/messages/ to avoid breaking the build.
  */
-#define COPYRIGHT_YEARS    "1998-2017"
-#define COPYRIGHT_STRING   "Copyright (C) " COPYRIGHT_YEARS " " COMPANY_NAME
-#define RIGHT_RESERVED     "All rights reserved."
+#define COPYRIGHT_YEARS  "1998-2018" /* See the note above when changing. */
+#define COPYRIGHT_STRING "Copyright (C) " COPYRIGHT_YEARS " " COMPANY_NAME
+#define RIGHT_RESERVED   "All rights reserved."
 
 /*
  * Use UTF8_COPYRIGHT_STRING_BASE when the COMPANY_NAME must be separated out

diff --git a/open-vm-tools/modules/shared/vmxnet/upt1_defs.h b/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
index 5bb3daa8d57dd36a750de88f7ee2859bc28c9e88..6631f6ae1f5e9115767ba4891a19435293c34454 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/upt1_defs.h
@@ -118,5 +118,6 @@ UPT1_RSSConf;
 #define UPT1_F_RSS         0x0002
 #define UPT1_F_RXVLAN      0x0004   /* VLAN tag stripping */
 #define UPT1_F_LRO         0x0008
+#define UPT1_F_INNER_LRO   0x0010   /* LRO for Geneve/VXLAN encap packets */
 
 #endif