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/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index 7046594a6c07f29ba7202db6ad2c6ae80a9d6512..024d99ad1e563ef96449fff29151128765a008ba 100644 (file)
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -20,7 +20,8 @@
 #define VM_DEVICE_VERSION_H
 
 #define INCLUDE_ALLOW_USERLEVEL
-
+#define INCLUDE_ALLOW_DISTRIBUTE
+#define INCLUDE_ALLOW_VMKDRIVERS
 #define INCLUDE_ALLOW_MODULE
 #define INCLUDE_ALLOW_VMKERNEL
 #define INCLUDE_ALLOW_VMCORE

diff --git a/open-vm-tools/modules/linux/shared/compat_autoconf.h b/open-vm-tools/modules/linux/shared/compat_autoconf.h
index 868b3ad79bb84f561fc5b236fe6eb3c02bff397a..26064aa8d0b03599a66aaa33c8c62a0ef7dd4ce6 100644 (file)
--- a/open-vm-tools/modules/linux/shared/compat_autoconf.h
+++ b/open-vm-tools/modules/linux/shared/compat_autoconf.h
@@ -23,6 +23,7 @@
 #define INCLUDE_ALLOW_MODULE
 #define INCLUDE_ALLOW_VMCORE
 #define INCLUDE_ALLOW_DISTRIBUTE
+#define INCLUDE_ALLOW_VMKDRIVERS
 #include "includeCheck.h"
 
 

diff --git a/open-vm-tools/modules/linux/shared/compat_netdevice.h b/open-vm-tools/modules/linux/shared/compat_netdevice.h
index 7a563048ddfddfac189fffc26e31de68b1ee60a0..715c91f484ddc1934f2a68a471a093cfea128b97 100644 (file)
--- a/open-vm-tools/modules/linux/shared/compat_netdevice.h
+++ b/open-vm-tools/modules/linux/shared/compat_netdevice.h
@@ -280,7 +280,7 @@ static inline int compat_unregister_netdevice_notifier(struct notifier_block *nb
         unregister_netdevice_notifier(_nb);
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) || defined(__VMKLNX__)
 
 #   define compat_netif_napi_add(dev, napi, poll, quota) \
       netif_napi_add(dev, napi, poll, quota)

diff --git a/open-vm-tools/modules/linux/shared/compat_version.h b/open-vm-tools/modules/linux/shared/compat_version.h
index 4e627087c382dc82a209074f9e305c927d3242ae..5eea894014b024a63c8ceab9af22476ebdce72ac 100644 (file)
--- a/open-vm-tools/modules/linux/shared/compat_version.h
+++ b/open-vm-tools/modules/linux/shared/compat_version.h
@@ -23,6 +23,7 @@
 #define INCLUDE_ALLOW_MODULE
 #define INCLUDE_ALLOW_VMCORE
 #define INCLUDE_ALLOW_DISTRIBUTE
+#define INCLUDE_ALLOW_VMKDRIVERS
 #include "includeCheck.h"
 
 

diff --git a/open-vm-tools/modules/linux/shared/compat_workqueue.h b/open-vm-tools/modules/linux/shared/compat_workqueue.h
index be74a1b3cfed96d5b3f90e0b91620193821e9cb6..78b5bfcebeff0e3f09537f4ef3f0b5954c970b0a 100644 (file)
--- a/open-vm-tools/modules/linux/shared/compat_workqueue.h
+++ b/open-vm-tools/modules/linux/shared/compat_workqueue.h
@@ -124,7 +124,8 @@ __compat_delayed_work_timer(unsigned long arg)
 # define COMPAT_DELAYED_WORK_GET_DATA(_p, _type, _member) \
    (_type *)(_p)
 
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)  /* } { */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)       \
+      && !defined(__VMKLNX__) /* } { */
 typedef struct work_struct compat_work;
 typedef struct work_struct compat_delayed_work;
 typedef void * compat_work_arg;

diff --git a/open-vm-tools/modules/linux/shared/driver-config.h b/open-vm-tools/modules/linux/shared/driver-config.h
index 927e7802dc6a97bdc45f9d120fe892d9b81cd940..fbf45d3c7dbc0002894cd79bf413f010042741b5 100644 (file)
--- a/open-vm-tools/modules/linux/shared/driver-config.h
+++ b/open-vm-tools/modules/linux/shared/driver-config.h
@@ -29,6 +29,8 @@
 #define INCLUDE_ALLOW_VMCORE
 #define INCLUDE_ALLOW_VMMON
 #define INCLUDE_ALLOW_MODULE
+#define INCLUDE_ALLOW_DISTRIBUTE
+#define INCLUDE_ALLOW_VMKDRIVERS
 #include "includeCheck.h"
 
 #include "compat_version.h"

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
index 34994b0dd81c73c2c67c25e825fa785eeed5b2f1..3e63afd7ac1197b348cdcb4d8533d00fc6f67020 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
@@ -42,7 +42,8 @@
 
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMKERNEL
-
+#define INCLUDE_ALLOW_DISTRIBUTE
+#define INCLUDE_ALLOW_VMKDRIVERS
 #define INCLUDE_ALLOW_VMCORE
 #define INCLUDE_ALLOW_MODULE
 #include "includeCheck.h"