/[gentoo-x86]/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch
Gentoo

Diff of /app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.2 Revision 1.3
1diff --git a/bridge.c b/bridge.c 1diff --git a/bridge.c b/bridge.c
2index cdf9e0b..700c1a2 100644 2index cdf9e0b..f46031b 100644
3--- a/bridge.c 3--- a/bridge.c
4+++ b/bridge.c 4+++ b/bridge.c
5@@ -275,7 +275,7 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge 5@@ -275,7 +275,11 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge
6 struct net_device *net) // IN: Network device 6 struct net_device *net) // IN: Network device
7 { 7 {
8 #ifdef VMW_NETDEV_HAS_NET 8 #ifdef VMW_NETDEV_HAS_NET
9- if (net->nd_net != bridge->internalDev->nd_net) { 9+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
10+ if (dev_net(net) != dev_net(bridge->internalDev)) { 10+ if (dev_net(net) != dev_net(bridge->internalDev)) {
11+#else
12 if (net->nd_net != bridge->internalDev->nd_net) {
13+#endif
11 return 0; 14 return 0;
12 } 15 }
13 #endif 16 #endif
14diff --git a/compat_semaphore.h b/compat_semaphore.h 17diff --git a/compat_semaphore.h b/compat_semaphore.h
15index a3a88c2..c3038d7 100644 18index a3a88c2..c3038d7 100644

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.20