From: VMware, Inc <>
Date: Tue, 29 Mar 2011 18:53:07 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.03.28-387002~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d729aca40433504b7cb4b2164b9fffde3af558bb;p=thirdparty%2Fopen-vm-tools.git

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 7046594a6..024d99ad1 100644
--- 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 868b3ad79..26064aa8d 100644
--- 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 7a563048d..715c91f48 100644
--- 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 4e627087c..5eea89401 100644
--- 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 be74a1b3c..78b5bfceb 100644
--- 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 927e7802d..fbf45d3c7 100644
--- 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 34994b0dd..3e63afd7a 100644
--- 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"