fixed patch for 3.2.0 kernel . Bug 397733.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index fe99073383971f2d509edc1b7fa1ab2f7f47839f..3a49a8074ddb5719781c741dbc9adc2733a00bf4 100644 (file)
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.85 2012/01/06 14:30:38 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.86 2012/01/06 21:29:50 vadimk Exp $
+
+  06 Jan 2012; Vadim Kuznetsov <vadimk@gentoo.org> files/264-3.2.0.patch:
+  fixed patch for 3.2.0 kernel . Bug 397733.
 
   06 Jan 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/264-3.2.0.patch,
   vmware-modules-264.1.ebuild:

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index d6d47b577d5efa405709a1d0477b5226f8d56d4a..eb97ad7ffca79bc31bff3cc7f799c63a9ecb6eed 100644 (file)
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -7,19 +7,19 @@ AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d4
 AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
 AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0
 AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458
-AUX 264-3.2.0.patch 3100 RMD160 7ca6bf61249fd0f4fde34b621c605e9be0fe3789 SHA1 b4ecbf4d890ea55e17047102af52632db0a420bd SHA256 40ac22fc4a1cf859186e26155ff96ab2bbd26ea58be2f6bce5c2b12e0949c4bd
+AUX 264-3.2.0.patch 3527 RMD160 1bb5eaebbf8cc17bd9dd4f2cd87554e52bb1f714 SHA1 0d80f90ef11fc07064963c4ec90a136a8b40189a SHA256 5c4e679b9667a353c4b19ad17ec086386314a56c1890e87a44fc6da16c655029
 AUX 264-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
 AUX 264-makefile-include.patch 2501 RMD160 da46f1229097539c7272d421f4d50b322e4d6e28 SHA1 30b57e8033e49eaf4923a4032765950e684533fc SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169
 AUX 264-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
 AUX 264-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751
 EBUILD vmware-modules-238.5.ebuild 1991 RMD160 fde27449f5ec59546fcc83592541d23d6cfe7b10 SHA1 ff401389381805741db248a3da10125c6036efd7 SHA256 74eb7f90a96ef0cd74ce8f2bef164ddb9b20f27c00131c76e3e4da3650e7d254
 EBUILD vmware-modules-264.1.ebuild 1947 RMD160 462c55f79892966bbef1f0c505092b9c8b579abc SHA1 d63b451316f54854188bcc71185bfeeb92761325 SHA256 8fc6e05da6208ee6652ef316e4b46e059a8e27cc7c4d87260f668bdfa77c5103
-MISC ChangeLog 19253 RMD160 986bffd617a4c256b631254839610a887d152e56 SHA1 3c46cb2e2c55446d222031b8e439e8140549d2b3 SHA256 f0e5f3d7677d89aaa303a91663aed03f554d57d87dfe45bc7877579d4f8bd2d0
+MISC ChangeLog 19373 RMD160 eb25c492463a32d8478515cd4beb43586b997dab SHA1 f2da9697a65d538d8e1647c3276f6ed98d28c194 SHA256 cf5243acabc895573c8226f11dfb2419f1db23b0c21fa20c0597299963a2608c
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8HBZwACgkQiLKviuHfItVZdACgisAQxIxdm+sdEktFUGzD5QSe
-iIsAoInteJlZhuH5Ey7kLCLj+sbbbUIB
-=Rz9j
+iEYEARECAAYFAk8HZ90ACgkQiLKviuHfItUIpgCfbHFZIk3PgwgfaporaLpUhKTH
+L78AoKaA9yrj+HCGz0grssojygPkpJCu
+=HeYw
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
index 60a0be288765c40242d8eb72ef909ec7d34cbd93..5baa61df9e9d48569b918c022fdb008fb15ab79b 100644 (file)
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ b/app-emulation/vmware-modules/files/264-3.2.0.patch
@@ -1,5 +1,5 @@
 diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index c692c2d..e8b6099 100644
+index c692c2d..501d602 100644
 --- a/vmmon-only/linux/iommu.c
 +++ b/vmmon-only/linux/iommu.c
 @@ -42,6 +42,12 @@
@@ -31,14 +31,14 @@ index 491add5..74f7a3b 100644
  #define VNET_FILTER_ACTION_DRP         (1)
  #define VNET_FILTER_ACTION_DRP_SHORT   (2)
 diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 4bdb643..540301c 100644
+index 4bdb643..5b71339 100644
 --- a/vmnet-only/netif.c
 +++ b/vmnet-only/netif.c
 @@ -62,7 +62,9 @@ static int  VNetNetifClose(struct net_device *dev);
  static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
  static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
  static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
  static void VNetNetifSetMulticast(struct net_device *dev);
 +#endif
  #if 0
@@ -54,11 +54,21 @@ index 4bdb643..540301c 100644
        /*
         * We cannot stuck... If someone will report problems under
         * low memory conditions or some such, we should enable it.
-@@ -612,11 +616,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
+@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
+    dev->stop = VNetNetifClose;
+    dev->get_stats = VNetNetifGetStats;
+    dev->set_mac_address = VNetNetifSetMAC;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+    dev->set_multicast_list = VNetNetifSetMulticast;
++#endif
+    /*
+     * We cannot stuck... If someone will report problems under
+     * low memory conditions or some such, we should enable it.
+@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
   *----------------------------------------------------------------------
   */
  
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
  void
  VNetNetifSetMulticast(struct net_device *dev) // IN: unused
  {