From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 5 Jan 2018 22:47:15 +0000 (-0800)
Subject: Changes to common header files not applicable to open-vm-tools
X-Git-Tag: stable-10.3.0~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f7c09d106884c19100077fdffe8f11b80d6bdb;p=thirdparty%2Fopen-vm-tools.git

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 777a8bbc6..34100564c 100644
--- 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 5bb3daa8d..6631f6ae1 100644
--- 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