diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2009-01-14 23:05:51 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2009-01-14 23:05:51 +0000 |
| commit | 4c57b6206869ebfe1e663aee124f78547ad8afb7 (patch) | |
| tree | e66e56d952a8b645194ae1bc544a9b52e30c5b10 /app-emulation | |
| parent | fix manifest for cardoe (diff) | |
| download | gentoo-2-4c57b6206869ebfe1e663aee124f78547ad8afb7.tar.gz gentoo-2-4c57b6206869ebfe1e663aee124f78547ad8afb7.tar.bz2 gentoo-2-4c57b6206869ebfe1e663aee124f78547ad8afb7.zip | |
Third time lucky, more patches for < 2.6.26 kernels.
(Portage version: 2.2_rc22/cvs/Linux 2.6.28 i686)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/vmware-modules/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch | 22 |
2 files changed, 20 insertions, 8 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index feab9385cad8..45759f41ae5d 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.40 2009/01/14 00:06:04 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.41 2009/01/14 23:05:51 ikelos Exp $ + + 14 Jan 2009; Mike Auty <ikelos@gentoo.org> + files/patches/vmnet/030_all_kernel-2.6.27.patch: + Third time lucky, more patches for < 2.6.26 kernels. 14 Jan 2009; Mike Auty <ikelos@gentoo.org> files/patches/vmnet/030_all_kernel-2.6.27.patch: diff --git a/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch b/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch index 9d65f837d777..164830379d9c 100644 --- a/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch +++ b/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch @@ -1,12 +1,12 @@ diff --git a/bridge.c b/bridge.c -index cdf9e0b..f46031b 100644 +index cdf9e0b..de78618 100644 --- a/bridge.c +++ b/bridge.c @@ -275,7 +275,11 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge struct net_device *net) // IN: Network device { #ifdef VMW_NETDEV_HAS_NET -+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) + if (dev_net(net) != dev_net(bridge->internalDev)) { +#else if (net->nd_net != bridge->internalDev->nd_net) { @@ -53,24 +53,32 @@ index 07e894d..73d31e8 100644 } diff --git a/vmnetInt.h b/vmnetInt.h -index 483c457..551be73 100644 +index 483c457..2328ec6 100644 --- a/vmnetInt.h +++ b/vmnetInt.h -@@ -63,7 +63,7 @@ +@@ -63,7 +63,11 @@ # define dev_lock_list() read_lock(&dev_base_lock) # define dev_unlock_list() read_unlock(&dev_base_lock) # ifdef VMW_NETDEV_HAS_NET --# define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + # define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) ++# else +# define DEV_GET(x) __dev_get_by_name(dev_net((x)->internalDev), (x)->name) ++# endif # else # define DEV_GET(x) __dev_get_by_name((x)->name) # endif -@@ -87,7 +87,7 @@ +@@ -87,8 +91,13 @@ #ifdef VMW_NETDEV_HAS_NET extern struct proto vmnet_proto; --# define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) +# define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \ ++ PF_NETLINK, _pri, &vmnet_proto) ++# else + # define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ PF_NETLINK, _pri, &vmnet_proto) ++# endif #elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO) extern struct proto vmnet_proto; + # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) |