missing patch

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

3 files changed, 95 insertions, 5 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 47573ed2570a..e107a0a9e80d 100644
--- 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.88 2012/03/10 14:17:50 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.89 2012/03/12 13:36:34 vadimk Exp $
+
+  12 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/264.2-3.2.0.patch:
+  missing patch
 
 *vmware-modules-264.2 (10 Mar 2012)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index ee51eab8f4fb..55e47c548e25 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -14,15 +14,16 @@ AUX 264-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA
 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
+AUX 264.2-3.2.0.patch 2949 RMD160 e343db72eeb80e43ab5fbd5b4c2efebcb81c2c5e SHA1 bf88b0be9fcdc9705de846452d44833e0b146c11 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0
 EBUILD vmware-modules-238.5.ebuild 2087 RMD160 6770e9125947e21472749ce723d5bbb201b5c345 SHA1 5d0e2337a14f7b572f0fbc400ab8fc52124d6009 SHA256 531581204310b9fd300f8ddd1125ed39d89cc8d9b8412c4cde2192e81e900df4
 EBUILD vmware-modules-264.1.ebuild 1947 RMD160 462c55f79892966bbef1f0c505092b9c8b579abc SHA1 d63b451316f54854188bcc71185bfeeb92761325 SHA256 8fc6e05da6208ee6652ef316e4b46e059a8e27cc7c4d87260f668bdfa77c5103
 EBUILD vmware-modules-264.2.ebuild 1941 RMD160 ad9cc388f6d82f8b7f33f9a3032036aed448be0f SHA1 95d3da2a3f25625ba6497a42fe4f06008fa2782a SHA256 3813bf34959246399ebaf64aac5bdb5ff746b9b39a4b739a1dc3a3b98fd96b5c
-MISC ChangeLog 19705 RMD160 80a2d35c6d06e6fd6b5ceaadc298daa575eeae4c SHA1 88e62b52651b561d9fea059a21f9d86039e96daa SHA256 f5bdefebe8c90f9c45168ee4293bcf6b85bc2b6c65e3ae3aa0516b41bc44d582
+MISC ChangeLog 19799 RMD160 1fc2a4f4fd4e5d9434f89282692e94d1836f31d8 SHA1 25af5293efd78d7f665c2f3cfd44878b5e2b21d1 SHA256 0a6b400ad62969e7cce4a4f337526f756023851d155eb87d7af4174bf56564f2
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9bYqUACgkQiLKviuHfItVAWgCeKHM1TkaBqu7cDlYmQknBzhSG
-iOoAoI5qUN22r0LFphFeyLSNLDcWFJvQ
-=/PYG
+iEYEARECAAYFAk9d+/EACgkQiLKviuHfItVzDACgxTnnEaDbw6K/dsEZA908CRRy
+ELoAoMMNy1vAfipweLn1Kr1g56VkJZsC
+=Q2ah
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/264.2-3.2.0.patch b/app-emulation/vmware-modules/files/264.2-3.2.0.patch
new file mode 100644
index 000000000000..87f89147e2b4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264.2-3.2.0.patch
@@ -0,0 +1,86 @@
+diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
+index 491add5..74f7a3b 100644
+--- a/vmnet-only/filter.c
++++ b/vmnet-only/filter.c
+@@ -40,6 +40,10 @@
+ #include "vnetInt.h"
+ #include "vmnetInt.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#include <linux/export.h>
++#endif
++
+ // VNet_FilterLogPacket.action for dropped packets
+ #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..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)
+ static void VNetNetifSetMulticast(struct net_device *dev);
++#endif
+ #if 0
+ static void VNetNetifTxTimeout(struct net_device *dev);
+ #endif
+@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
+       .ndo_stop = VNetNetifClose,
+       .ndo_get_stats = VNetNetifGetStats,
+       .ndo_set_mac_address = VNetNetifSetMAC,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+       .ndo_set_multicast_list = VNetNetifSetMulticast,
++#endif
+       /*
+        * We cannot stuck... If someone will report problems under
+        * low memory conditions or some such, we should enable it.
+@@ -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)
+ void
+ VNetNetifSetMulticast(struct net_device *dev) // IN: unused
+ {
+ }
+-
++#endif
+ 
+ /*
+  *----------------------------------------------------------------------
+diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
+index 541187b..77e0089 100644
+--- a/vmnet-only/userif.c
++++ b/vmnet-only/userif.c
+@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
+ 	 unsigned int tmpCsum;
+ 	 const void *vaddr;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++	 vaddr = kmap(skb_frag_page(frag));
++#else
+ 	 vaddr = kmap(frag->page);
++#endif
+ 	 tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
+ 					 curr, frag->size, 0, &err);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++	 kunmap(skb_frag_page(frag));
++#else
+ 	 kunmap(frag->page);
++#endif
+ 	 if (err) {
+ 	    return err;
+ 	 }