Bump vmware-modules to any-any115, and apply fixes for wireless and 2.6.24.

Package-Manager: portage-2.1.4

2 files changed, 33 insertions, 0 deletions

diff --git a/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch b/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch
new file mode 100644
index 000000000000..19c97d7e5b71
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch
@@ -0,0 +1,12 @@
+diff -uNr vmmon-only.old/include/vcpuset.h vmmon-only/include/vcpuset.h
+--- vmmon-only.old/include/vcpuset.h    2007-07-22 12:21:17.000000000 +0100
++++ vmmon-only/include/vcpuset.h    2007-12-01 15:52:11.000000000 +0000
+@@ -71,7 +71,7 @@
+ #define ffs(x) ffs_x86_64(x)
+ 
+ #elif defined MODULE
+-   #include "asm/bitops.h"
++   #include "linux/bitops.h"
+ #elif defined __APPLE__ && defined KERNEL
+    /* 
+     * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines 
diff --git a/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch b/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch
new file mode 100644
index 000000000000..a550e89e99b1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch
@@ -0,0 +1,21 @@
+diff -uNr vmnet-only.old/bridge.c vmnet-only/bridge.c
+--- vmnet-only.old/bridge.c	2008-01-06 21:25:04.000000000 +0000
++++ vmnet-only/bridge.c	2008-01-06 21:27:42.000000000 +0000
+@@ -32,7 +32,7 @@
+ #include <linux/tcp.h>
+ #include <net/tcp.h>
+ 
+-#ifdef CONFIG_NET_RADIO
++#if defined CONFIG_NET_RADIO || defined CONFIG_WLAN_80211
+ #   include <linux/wireless.h>
+ #endif
+ #include "vmnetInt.h"
+@@ -764,7 +764,7 @@
+ {
+ #ifdef CONFIG_WIRELESS_EXT
+    return dev->wireless_handlers != NULL;
+-#elif !defined(CONFIG_NET_RADIO)
++#elif !defined CONFIG_NET_RADIO && !defined CONFIG_WLAN_80211
+    return FALSE;
+ #elif WIRELESS_EXT > 19
+    return dev->wireless_handlers != NULL;