Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/foundryMsg/vixTranslateErrOpenSource.c b/open-vm-tools/lib/foundryMsg/vixTranslateErrOpenSource.c
index 61d2b7c1dde2a93f8879292e70744cde4d1ebf72..726280fd65a505c2cbe75946a588f84b3e20045b 100644 (file)
--- a/open-vm-tools/lib/foundryMsg/vixTranslateErrOpenSource.c
+++ b/open-vm-tools/lib/foundryMsg/vixTranslateErrOpenSource.c
@@ -333,14 +333,16 @@ Vix_TranslateErrno(int systemError)             // IN
       break;
 #ifndef _WIN32
    case EMSGSIZE:
+#endif
+   case EINVAL:
       err = VIX_E_INVALID_ARG;
       break;
+#ifndef _WIN32
    case ELOOP:
 #endif
    case ENOMEM:
       err = VIX_E_OUT_OF_MEMORY;
       break;
-   case EINVAL:
    default:
       err = VIX_E_FAIL;
    }

diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
index ce1bfb4e080718348ea34141b6ef837049df9dd8..139f538c600615e54abd7aec10de30545b37f425 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
@@ -78,5 +78,8 @@
 #define VMNET_CAP_RDONLY_INETHDRS 0x800000 /* Modifies inet headers for TSO/CSUm */
 #define VMNET_CAP_NPA         0x1000000        /* Support NPA */
 #define VMNET_CAP_DCB         0x2000000        /* Support DCB */
-
+#define VMNET_CAP_OFFLOAD_8OFFSET 0x4000000 /* supports 8bit parameterized offsets */ 
+#define VMNET_CAP_OFFLOAD_16OFFSET 0x8000000 /* supports 16bit parameterized offsets */ 
+#define VMNET_CAP_IP6_CSUM_EXT_HDRS 0x10000000 /* support csum of ip6 ext hdrs */
+#define VMNET_CAP_TSO6_EXT_HDRS 0x20000000 /* support TSO for ip6 ext hdrs */
 #endif // _VMNET_DEF_H_