Add patch to try and fix bug 254768.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 i686

3 files changed, 16 insertions, 9 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 627772ac5cf0..feab9385cad8 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.39 2009/01/12 23:25:46 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.40 2009/01/14 00:06:04 ikelos Exp $
+
+  14 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  files/patches/vmnet/030_all_kernel-2.6.27.patch:
+  Add patch to try and fix bug 254768.
 
   12 Jan 2009; Mike Auty <ikelos@gentoo.org> Manifest:
   Fix up vmware-modules-1.0.0.15 patches for kernels older than 2.6.27.
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 58658a6663b0..9549233ad4eb 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -16,7 +16,7 @@ AUX patches/vmmon/035_all_kernel-2.6.25.patch 541 RMD160 fb0ec4af96238541ef3d5c6
 AUX patches/vmmon/040_all_kernel-2.6.27.patch 17842 RMD160 b0caa9c331e46d30383d49371972f201689c1276 SHA1 908e15eb2b56c680e4385c89a683287c323512d3 SHA256 249733eb7f6341ba1b3135bea8690ef69f1e300baa24cc69cdc5a54b13426f8f
 AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5701b831035853d9e SHA1 a3e714383be2e0abbc434d5f3ef5253b72978c81 SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60
 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17
-AUX patches/vmnet/030_all_kernel-2.6.27.patch 2169 RMD160 4bbd631917544b357652fb6b7d66ac1bf3e46a71 SHA1 51a26ec22e9591bfc82f13d4382f4c59c7f3ebfb SHA256 6bfbaeb9b604012c19490e2c95c2c56d83d87bb5ff6bc4019d4c694289573f5d
+AUX patches/vmnet/030_all_kernel-2.6.27.patch 2236 RMD160 1b415cd3aeab9a7ce1cb23e9efc99534983e6645 SHA1 26e62550971e5f4f1328a0c546e219d0e493f781 SHA256 43f3f49c21c797a6ee184af258eef61dd2fd9b9e2be2f104a86607e28ffcd36a
 DIST VMware-player-2.0.4-93057.i386.tar.gz 68617186 RMD160 b0e7934ca27573aac74b4ce5275c207ed0db0661 SHA1 7ae213660f05e7c1e8fa3dd177a8ebe71478b9ac SHA256 59045fa684754b95e3928fbdb9f30c7df25dff4f273e8a235b58edc16d7fafe5
 DIST VMware-player-2.0.4-93057.x86_64.tar.gz 33315373 RMD160 5ec83275723067f4a0b554924efaf0ee04346c37 SHA1 edbdfb9e8b25e487b9354583c59e59b293a59719 SHA256 e9e2be069171f33365cba964e966aab7c78b7b6ee551905c62ee1326e867e3e2
 DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955
@@ -29,12 +29,12 @@ EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b747
 EBUILD vmware-modules-1.0.0.20.ebuild 1345 RMD160 6a9021b9d7c826b98331a3f48b08d312835816f7 SHA1 f15546947bf924c0c00a5f0982cb24ddedc0301d SHA256 8faa01aacb7986dfac03963c2b21136989976b7e3248867ecc33e9f28b03adc2
 EBUILD vmware-modules-1.0.0.22.ebuild 1355 RMD160 1064c34e307c8c70b32161d8c06e9e27eee97833 SHA1 105aa9d158b61fff03d95bcaee41d740a6597f8f SHA256 2cca5e1a19ebb984805a6b67289184d6d043f1e69dca1791366a228c831ee65e
 EBUILD vmware-modules-1.0.0.23.ebuild 724 RMD160 35c62995060e0c709dbd690ef63c48a431dfae8a SHA1 6ea6e450fd540c772f5c7227056848f8513939c2 SHA256 a132d0c74e914ff65e0cef0bdbe54e4e9e05e59ad7d1dc72e404d568bd0e31f4
-MISC ChangeLog 9089 RMD160 fa267f4b0a6c7dc6394a5c9f3766072bf9efed8d SHA1 a7d0a0da20eab968eb3198f92a8ae612eec62d16 SHA256 250a8ea02e223494c8da945a909130acea9573d5cd7255e64030484d52f8d09d
+MISC ChangeLog 9225 RMD160 120a54c806c457e4c990cf2def6bff48cbfcb739 SHA1 e82dd305f90c84c41ff45dec281b1b2569cbd00c SHA256 f60af65958295aa532dbed3a99860650f8eb6c584dd734761139e88203c206d5
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklr3p4ACgkQu7rWomwgFXrkagCePpLndMNjpzeGtbSRBJuWvE5g
-R4oAn3KNsRAnAEirTlFR1q7GBb3d/Oe+
-=BM0v
+iEYEARECAAYFAkltLH0ACgkQu7rWomwgFXrLwACfXZUiTCXIH6UoQipOmk2ekBtp
+fHMAnRpxF/A6V8bDfiGgL/pQZR8JgL0Q
+=4Lwd
 -----END PGP SIGNATURE-----
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 981b78c68eb8..9d65f837d777 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,13 +1,16 @@
 diff --git a/bridge.c b/bridge.c
-index cdf9e0b..700c1a2 100644
+index cdf9e0b..f46031b 100644
 --- a/bridge.c
 +++ b/bridge.c
-@@ -275,7 +275,7 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
+@@ -275,7 +275,11 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
                          struct net_device *net)  // IN: Network device
  {
  #ifdef VMW_NETDEV_HAS_NET
--   if (net->nd_net != bridge->internalDev->nd_net) {
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
 +   if (dev_net(net) != dev_net(bridge->internalDev)) {
++#else
+    if (net->nd_net != bridge->internalDev->nd_net) {
++#endif
        return 0;
     }
  #endif