Gentoo Archives: gentoo-commits

From: "Mike Auty (ikelos)" <ikelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files/patches/vmnet: 030_all_kernel-2.6.27.patch
Date: Wed, 14 Jan 2009 00:06:08
Message-Id: E1LMtGn-0005z4-7F@stork.gentoo.org
1 ikelos 09/01/14 00:06:05
2
3 Modified: 030_all_kernel-2.6.27.patch
4 Log:
5 Add patch to try and fix bug 254768.
6 (Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686)
7
8 Revision Changes Path
9 1.3 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.3&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.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?r1=1.2&r2=1.3
14
15 Index: 030_all_kernel-2.6.27.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- 030_all_kernel-2.6.27.patch 13 Jan 2009 00:21:34 -0000 1.2
22 +++ 030_all_kernel-2.6.27.patch 14 Jan 2009 00:06:05 -0000 1.3
23 @@ -1,13 +1,16 @@
24 diff --git a/bridge.c b/bridge.c
25 -index cdf9e0b..700c1a2 100644
26 +index cdf9e0b..f46031b 100644
27 --- a/bridge.c
28 +++ b/bridge.c
29 -@@ -275,7 +275,7 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge
30 +@@ -275,7 +275,11 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge
31 struct net_device *net) // IN: Network device
32 {
33 #ifdef VMW_NETDEV_HAS_NET
34 -- if (net->nd_net != bridge->internalDev->nd_net) {
35 ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
36 + if (dev_net(net) != dev_net(bridge->internalDev)) {
37 ++#else
38 + if (net->nd_net != bridge->internalDev->nd_net) {
39 ++#endif
40 return 0;
41 }
42 #endif