1 |
ikelos 09/01/10 12:10:56 |
2 |
|
3 |
Added: 030_all_kernel-2.6.27.patch |
4 |
Log: |
5 |
Add in vmware-modules-1.0.0.15-r2. Should compile on kernels up to and including 2.6.28, big thanks go to Tim Yamin for help with the patches. |
6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: 030_all_kernel-2.6.27.patch |
15 |
=================================================================== |
16 |
diff -pur vmnet-only.orig/bridge.c vmnet-only/bridge.c |
17 |
--- vmnet-only.orig/bridge.c 2008-05-10 06:25:56.000000000 +0200 |
18 |
+++ vmnet-only/bridge.c 2008-10-16 18:36:57.000000000 +0200 |
19 |
@@ -274,7 +274,7 @@ VNetBridgeDevCompatible(VNetBridge *brid |
20 |
struct net_device *net) // IN: Network device |
21 |
{ |
22 |
#ifdef VMW_NETDEV_HAS_NET |
23 |
- if (net->nd_net != bridge->internalDev->nd_net) { |
24 |
+ if (dev_net(net) != dev_net(bridge->internalDev)) { |
25 |
return 0; |
26 |
} |
27 |
#endif |
28 |
diff -pur vmnet-only.orig/compat_semaphore.h vmnet-only/compat_semaphore.h |
29 |
--- vmnet-only.orig/compat_semaphore.h 2008-05-10 06:25:56.000000000 +0200 |
30 |
+++ vmnet-only/compat_semaphore.h 2008-10-16 18:37:21.000000000 +0200 |
31 |
@@ -2,7 +2,7 @@ |
32 |
# define __COMPAT_SEMAPHORE_H__ |
33 |
|
34 |
|
35 |
-#include <asm/semaphore.h> |
36 |
+#include <linux/semaphore.h> |
37 |
|
38 |
|
39 |
/* |
40 |
diff -pur vmnet-only.orig/procfs.c vmnet-only/procfs.c |
41 |
--- vmnet-only.orig/procfs.c 2008-05-10 06:25:56.000000000 +0200 |
42 |
+++ vmnet-only/procfs.c 2008-10-16 18:36:57.000000000 +0200 |
43 |
@@ -63,7 +63,7 @@ VNetProc_Init(void) |
44 |
{ |
45 |
int retval; |
46 |
|
47 |
- retval = VNetProc_MakeEntry(&proc_root, "vmnet", S_IFDIR, &base); |
48 |
+ retval = VNetProc_MakeEntry(NULL, "vmnet", S_IFDIR, &base); |
49 |
if (retval) { |
50 |
return retval; |
51 |
} |
52 |
@@ -95,7 +95,7 @@ VNetProc_Init(void) |
53 |
void |
54 |
VNetProc_Cleanup(void) |
55 |
{ |
56 |
- VNetProc_RemoveEntry(base, &proc_root); |
57 |
+ VNetProc_RemoveEntry(base, NULL); |
58 |
base = NULL; |
59 |
} |
60 |
|
61 |
diff -pur vmnet-only.orig/vmnetInt.h vmnet-only/vmnetInt.h |
62 |
--- vmnet-only.orig/vmnetInt.h 2008-05-10 06:25:56.000000000 +0200 |
63 |
+++ vmnet-only/vmnetInt.h 2008-10-16 18:36:57.000000000 +0200 |
64 |
@@ -63,7 +63,7 @@ |
65 |
# define dev_lock_list() read_lock(&dev_base_lock) |
66 |
# define dev_unlock_list() read_unlock(&dev_base_lock) |
67 |
# ifdef VMW_NETDEV_HAS_NET |
68 |
-# define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) |
69 |
+# define DEV_GET(x) __dev_get_by_name(dev_net((x)->internalDev), (x)->name) |
70 |
# else |
71 |
# define DEV_GET(x) __dev_get_by_name((x)->name) |
72 |
# endif |
73 |
@@ -89,7 +89,7 @@ |
74 |
|
75 |
#ifdef VMW_NETDEV_HAS_NET |
76 |
extern struct proto vmnet_proto; |
77 |
-# define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ |
78 |
+# define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \ |
79 |
PF_NETLINK, _pri, &vmnet_proto) |
80 |
#elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO) |
81 |
extern struct proto vmnet_proto; |