Clean up

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

13 files changed, 24 insertions, 1270 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index b5147ec2b40d..9f9a13429bc9 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.120 2014/06/07 22:25:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.121 2014/06/07 22:26:33 dilfridge Exp $
+
+  07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/264-3.2.0.patch, -files/264-d-make-root.patch,
+  -files/264-makefile-include.patch, -files/264-3.8.0.patch,
+  -files/264-jobserver.patch, -files/264-makefile-kernel-dir.patch,
+  -files/264-3.10.0.patch, -files/264-apic.patch, -files/264-netdevice.patch,
+  -files/264-newline.patch, -files/264-putname.patch:
+  Clean up
 
   07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 134b0143f3d7..f0345d9ab93b 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,17 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 264-3.10.0.patch 24201 SHA256 be0dbd21542475780bd391566ffd213b9ba9b3ce7a2383f10306ad0f7927b62e SHA512 7a5f6b0247db63894bcaa7718dc5d4cd7203bc42e1f5a3b5029ca92b25d19ac34f837a7f21661801a9c42f3f4ef84f8151afce4a0d1aab91c5e3e6122374537b WHIRLPOOL 2d9b3a0ce80d51ee79991c13d979d01ba8c6ecea8c3f04c5b991e5c5276c2b5f9f88b5f39d47c44d30ad6de5fbbb518a76d4405bcc47615eab23fc9918773b32
-AUX 264-3.2.0.patch 2949 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0 SHA512 d3b9f2ad688c7ad0922f9b036f3b2fb0e7209cf4814e34431dccb72f11d239ac8bf9cf16f7e6e8ddfbcf839ad043bbc45233fe488564665bb782b8e296e6facf WHIRLPOOL 4041bfbbb472c6eb7372ca8883ee037c0facc0d1b1c85fab3adb01783291e5c1f2b1685a9cfa41e4433d4255e495af735e0d8af0726c0bc31d15564c96abb0bc
-AUX 264-3.8.0.patch 1243 SHA256 75bca77a37dec85288c28805799690cbd39ef4dc87da9c7ee1486d7872a1e669 SHA512 4c6e437e7198cc24c344116410f175a460e81f5ec33e165dca80851c833925c722d0d0147b2df50aa5101afa16b9145538bf889a6d788b1265419bef04d40d49 WHIRLPOOL 0a4caf5729d1dfb05a0cc84176bc904383aaf184007fdc8fd953d9ba0c4234dc4fc49a99f5c1e1c1431dadff2a3d3bc8ce925a528306fa9ca5459e93321fd678
-AUX 264-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
-AUX 264-d-make-root.patch 519 SHA256 aad9819961203f4d2e65532567b4f5b485bb583f1a2f322e84919d95505ed0f1 SHA512 de192adfe94493d3e8ac405df035f9da44f9421093f2a2fc322dcf552b9ca3bea0582b1a23520ea1e31d13b8fabcabbe83ae4400172aae520fb2732f39a643da WHIRLPOOL 16f71333ac286a2ad1249bbc2ecabc07f849beaabf525d6d5d6abcd7d7fbb5e6533c723c4607145eb6d0f2463c72e3ae49f6004c942b25e593cb7da4c2601dd1
-AUX 264-jobserver.patch 2899 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d SHA512 cb744aaea00b6eb6970987dd62b71ee9194d8c9ee8941447f0f562af14ba342eee241a3b131de8ad96a8481a5cdf6d88149fd4d409d938ddfeb44b520c5bd790 WHIRLPOOL d7050bbb7160704a9f922a17e2aae14050f4618e9b469bcbb51ff0859be78f15374777b3e1504c87b5298b41ec8191dfa688a183a4d4c110bab8178d704562d1
-AUX 264-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338
-AUX 264-makefile-kernel-dir.patch 2201 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 SHA512 bb67ad9ec9152fb0192ba978566a6777bbf5d99ed8ccc6762c5af96615368d497d4183e42fbe78d8359f3d59749929742131e83e77edf649878767f0007babbf WHIRLPOOL 9932ed3ac03ead8507c348512a7a554dad28c2133347ce83dad4bc528228944559950258cb0f838bd8510d637988c2aba1105fa8fbea3a7852ed0df7af0aae49
-AUX 264-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
-AUX 264-newline.patch 448 SHA256 30a38b329ea2209c75fc20326ae6d5aef93ad6b17efba53a22ac49a7ec009727 SHA512 8aa405e985cd9faa5719210751ce9fecd198a174043a0c5976738a679dec82911bacbedb3c7af2e6f9334e5c63ef1747cdf7e3efcff83cfa1894f4af63da7d16 WHIRLPOOL 51227f28b7ce5343654f8c350be29839791a1f677d7358b239e1cfe410fb6a72351700f6bd63a3f38802d5e361a872b9356f376f65d34ad3bb5fc8ad05b763f7
-AUX 264-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
 AUX 271-3.10.0.patch 23418 SHA256 346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410 WHIRLPOOL 196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e
 AUX 271-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
 AUX 271-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
@@ -34,24 +23,24 @@ AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab4
 EBUILD vmware-modules-271.3.ebuild 2327 SHA256 03a2dc679b1e7e1e72fcf46c4b43a142abaaff183759a24f97d5e547722c1e39 SHA512 d72c2e798c3e9e8eff28f5986e5d82d896572a088ddf71f72510025e58d6b054c235c7217b24aa75ed4fedb2df8a0ece1bca698070ea8188fe1efa5a7d4d91ad WHIRLPOOL a95e8a7978f44331c8d3dd693508e1ce882af185c0bc0818644de4a7c408db2190f27c400e4864374732cea086183f629dbd510302e19aa5cbad6918e7436470
 EBUILD vmware-modules-279.1-r1.ebuild 2831 SHA256 86aacd4fcbad015b487565d0c21230927b05a5c4f1a223bbbec89b7288f95ef5 SHA512 e52be72e684c21128357631011c279dd6250d296df1ebb7c488e745827af17fa99e31945193f817278b41b1e2fc47460b5dae52004bf51e38822c4700a985c07 WHIRLPOOL 485b504c8c06e36423592fe10334a4975a146414171acdff250c29942adcdb66139eafbaa2f043b5a221479fbb27dcfeeecca2569ebaee19418144f610b19da4
 EBUILD vmware-modules-279.2.ebuild 2828 SHA256 e9b40f2e5e40512a98588976b1c7509e74882d81c6a6ce4cf282b7d8180a1567 SHA512 8e6943c5cbe1e63e1f71cf824c2b445abb7885abc8e0e68c1e75495a6491c3533f6fb5b06d37780ec7c9727224199a9a1080e6a62f3bba4b75b7d222a7464893 WHIRLPOOL d17a88c75719ac1b7b7da4a0cd525e7ab64f558e690d6ec6169f9c7b746277ccd298bd78ba951f5305a4f819984cb0291789cfe5cc2d74077d52814a026f7451
-MISC ChangeLog 26411 SHA256 9ef1e59ccd4e79737070fb0a002bb9115b7a429475601c83d2fcccd3508c8d93 SHA512 84c1d0b7e453195c7b3bc2e8e5d3999962a2f69b8e2110bd6a80685134b1c65e09f4ee75a496b466ea23c2759a38bb09263e782a6b534c5211c09949b42a8c19 WHIRLPOOL cd1d824cc792fff05c16ec43417f9d919e70a2982a8a1e5c602c10ffce3fe236673eed961a409f9a3885d98796edac2946648707e19b37dc1943b926796f5d50
+MISC ChangeLog 26797 SHA256 0f15c9360a67284f338acb3b8417f4c5dedf78def3a46656269cf64f6107f308 SHA512 8f07e950f68aa80af467f8d176f226edaea4e5b2cc13a7488521a2462395bc412cd3bb8c5e5292eceb37ede0470e1c4c4819bbac37e04d0373bf740edb8ea90c WHIRLPOOL e6c0a989229a11db2e3f8be5d8f5f34fdbd3655f8cef4b3628fa6fa374af04f09b74109106542c59c8c8c1f930c21d255c57b4bdc0465e5c054ca13391888393
 MISC metadata.xml 626 SHA256 df85fe94586e898742dda5a30bf95be1c66bded72b9b679b4bda9fb3113bb94a SHA512 5c16977fa1e95f123891324b24d20161bfbfa5f4a38371374290e635bba33cbbc933761f44b826503c37e4bb2295c4026356eddc6aef091c07dc17f773f538ec WHIRLPOOL f83d377fa941fbcfe25dfc83ad276f55782c1e9bdff6dc7ae147be667d7129ae55dae6c19c18544dc27123977d3aa6273f185b4cced70ab841e87a04a4fcae82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTk5FeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTk5GaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc434P/juYmCnLZ1h0lmotf7OBLonA
-X5FhIJk1DXXEcJrp4AUJnqVeyzgSNaFGezqPYweNxKOZmpeZndKYBVKmQksltDNh
-nga4Duv5KWeQFl9w8dEqPyAsc2KWFJnRTRWAOtsAVKPLZSZRHqJu1zE/cE8Yi2fe
-4PVYHxtnfE6YE16IWC37G1gNl1FmiN0/o8iuSM+b33x5/yFDHGepYLPc8v+amatf
-1Pm5zK7Rp4rVKg1Hie7fvEv3ya4Q9eiA21FfKk+fdpRl7lNfDtUIP3bTxxF1G0CA
-L9AUg6qIyk90NiqVb+BBai9jl5loCqZ7yo/JkjO45NYBk9KAd2vsZ+KJKBWnPiR0
-LRUlL4KnxcxUtYafC0nVXbGQKWm6AoAVANmErooJh5ZaRqlVLdDBXgNXJbHDDIsE
-CQpLWHKWriRTlE2AG1q9ISnzhactdaKFgOC2NJq2x91BexmpdqjdAXj3Bek/dGIu
-BhOIv7hrrrXsKtamQw9HuvKBlqgiNKO2Kh8SShnfRYJqGHGZ+fsjxwPaTQMrws5B
-Ry4rpBYmm9TLbZQ6E3uhm9tKDtjvok0Mwksh/MbOBPBjoDfI5WVmV2RVFmxmE+u/
-BEuuO/96nnMe72KgA/GlcPvUR8UwbCll4SXJn7zfrAfl8h8zLLDIgqWQnUzIteGD
-l2eksT3w9dk8NmBU/dO3
-=BIgN
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcj/cP/0UGl2GZGD6SHo/YituMwbQS
+tGXf9XGoiZ3ZXTA382T0WEfTHPli1wbLGvYFwyvhPwEbMsY0C/n1rsFw3vkaRLLd
+NXbZHWqtZeInASACeoC132MuHax52YNdcAcd5i2ki8GuIMlxdKWtLel4wUCT3XuC
+0Qdq7U1PmKMRj39RkC0fzvVsxmrCCvG2acFG8Tici3i+cwvEsxqAlfJNqbV0nzPk
+OdJDRZM+6jkgYBomsIqrfVASyVaJzc+le6p1KTkxLXeNXKk7s+yUJnHnhSXhiH+I
+w56smTBxtJHa7qWTuZy5RTwnzlq0yt1EVyGQhJ3KPKPDuJ5XMXTW4bhwjftX2gjX
+dhrw8aTpK8bgqas8BJHxo0JIk7Sd0BSRNhEsqx8Px3KLEhMKWijp99jVUe/sQ1NQ
+ffdkAeAjV65CdjK0OOkZ9dtQljVF9S6NIm5nQv/8LVeMhh0N6QoxvRExPkGB20rA
+JlU65mZwTbgV9RS6phKwsm05NHKSX1kISjiuewVOwCFZ0XCYfxHvzMUaJARXgdcN
+pXHvbKyi98B++nD9hDA+sQxHyrVitR1FQ8CLL2RDZuL54Epucn5OrMBpeZavk19J
+4Pu5GrKIpxJcyEId3E11tWuzUHbVn36ZPo2/3+vxBqeh4JNq/gPkSjLFH9ue6Zs9
+K26zdbMFD58fdTotEZ1l
+=AH/o
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/264-3.10.0.patch b/app-emulation/vmware-modules/files/264-3.10.0.patch
deleted file mode 100644
index cdff40045be0..000000000000
--- a/app-emulation/vmware-modules/files/264-3.10.0.patch
+++ /dev/null
@@ -1,828 +0,0 @@
-diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
-index 2dd83fe..d945749 100644
---- a/vmblock-only/linux/control.c
-+++ b/vmblock-only/linux/control.c
-@@ -208,9 +208,10 @@ SetupProcDevice(void)
-    VMBlockSetProcEntryOwner(controlProcMountpoint);
- 
-    /* Create /proc/fs/vmblock/dev */
--   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
--                                        VMBLOCK_CONTROL_MODE,
--                                        controlProcDirEntry);
-+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
-+                                  VMBLOCK_CONTROL_MODE,
-+                                  controlProcDirEntry,
-+                                  &ControlFileOps);
-    if (!controlProcEntry) {
-       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
-       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
-@@ -218,7 +219,6 @@ SetupProcDevice(void)
-       return -EINVAL;
-    }
- 
--   controlProcEntry->proc_fops = &ControlFileOps;
-    return 0;
- }
- 
-diff --git a/vmnet-only/bridge.c b/vmnet-only/bridge.c
-index 10eaa41..6fdc19e 100644
---- a/vmnet-only/bridge.c
-+++ b/vmnet-only/bridge.c
-@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
- static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
- static void VNetBridgePortsChanged(VNetJack *this);
- static int  VNetBridgeIsBridged(VNetJack *this);
--static int  VNetBridgeProcRead(char *page, char **start, off_t off,
--                               int count, int *eof, void *data);
- static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
- static PacketStatus VNetCallSMACFunc(struct SMACState *state,
-                                      struct sk_buff **skb, void *startOfData,
-@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetBridgeProcShow --
-+ *
-+ *      Callback for read operation on this bridge entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                   void    *data)   // IN: client data - pointer to bridge
-+{
-+   VNetBridge *bridge = (VNetBridge*)data;
-+
-+   if (!bridge) {
-+      return 0;
-+   }
-+
-+   VNetPrintPort(&bridge->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", bridge->name);
-+
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_bridge_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_bridge_fops = {
-+       .open           = proc_bridge_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetBridge_Create --
-  *
-  *      Creates a bridge. Allocates struct, allocates internal device,
-@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN:  name of device (e.g., "eth0")
-     * Make proc entry for this jack.
-     */
- 
--   retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
--                               &bridge->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
-+                               &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
-    if (retval) {
-       if (retval == -ENXIO) {
-          bridge->port.jack.procEntry = NULL;
-       } else {
-          goto out;
-       }
--   } else {
--      bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
--      bridge->port.jack.procEntry->data = bridge;
-    }
- 
-    /*
-@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb,         // IN: packet to receive
-    return 0;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetBridgeProcRead --
-- *
-- *      Callback for read operation on this bridge entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetBridgeProcRead(char    *page,   // IN/OUT: buffer to write into
--                   char   **start,  // OUT: 0 if file < 4k, else offset into page
--                   off_t    off,    // IN: (unused) offset of read into the file
--                   int      count,  // IN: (unused) maximum number of bytes to read
--                   int     *eof,    // OUT: TRUE if there is nothing more to read
--                   void    *data)   // IN: client data - pointer to bridge
--{
--   VNetBridge *bridge = (VNetBridge*)data;
--   int len = 0;
--
--   if (!bridge) {
--      return len;
--   }
--
--   len += VNetPrintPort(&bridge->port, page+len);
--
--   len += sprintf(page+len, "dev %s ", bridge->name);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index b12b982..395f5ce 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -1775,21 +1775,17 @@ VNetSetMACUnique(VNetPort *port,            // IN:
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintJack(const VNetJack *jack, // IN: jack
--              char           *buf)  // OUT: info about jack
-+              struct seq_file *seqf)  // OUT: info about jack
- {
--   int len = 0;
--
-    read_lock(&vnetPeerLock);
-    if (!jack->peer) {
--      len += sprintf(buf+len, "connected not ");
-+      seq_printf(seqf, "connected not ");
-    } else {
--      len += sprintf(buf+len, "connected %s ", jack->peer->name);
-+      seq_printf(seqf, "connected %s ", jack->peer->name);
-    }
-    read_unlock(&vnetPeerLock);
--
--   return len;
- }
- 
- 
-@@ -1809,52 +1805,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintPort(const VNetPort *port, // IN: port
--              char           *buf)  // OUT: info about port
-+              struct seq_file *seqf)  // OUT: info about port
- {
--   int len = 0;
-+   VNetPrintJack(&port->jack, seqf);
- 
--   len += VNetPrintJack(&port->jack, buf+len);
--
--   len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->paddr[0], port->paddr[1], port->paddr[2],
-                   port->paddr[3], port->paddr[4], port->paddr[5]);
- 
--   len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->ladrf[0], port->ladrf[1], port->ladrf[2],
-                   port->ladrf[3], port->ladrf[4], port->ladrf[5],
-                   port->ladrf[6], port->ladrf[7]);
- 
--   len += sprintf(buf+len, "flags IFF_RUNNING");
-+   seq_printf(seqf, "flags IFF_RUNNING");
- 
-    if (port->flags & IFF_UP) {
--      len += sprintf(buf+len, ",IFF_UP");
-+      seq_printf(seqf, ",IFF_UP");
-    }
- 
-    if (port->flags & IFF_BROADCAST) {
--      len += sprintf(buf+len, ",IFF_BROADCAST");
-+      seq_printf(seqf, ",IFF_BROADCAST");
-    }
- 
-    if (port->flags & IFF_DEBUG) {
--      len += sprintf(buf+len, ",IFF_DEBUG");
-+      seq_printf(seqf, ",IFF_DEBUG");
-    }
- 
-    if (port->flags & IFF_PROMISC) {
--      len += sprintf(buf+len, ",IFF_PROMISC");
-+      seq_printf(seqf, ",IFF_PROMISC");
-    }
- 
-    if (port->flags & IFF_MULTICAST) {
--      len += sprintf(buf+len, ",IFF_MULTICAST");
-+      seq_printf(seqf, ",IFF_MULTICAST");
-    }
- 
-    if (port->flags & IFF_ALLMULTI) {
--      len += sprintf(buf+len, ",IFF_ALLMULTI");
-+      seq_printf(seqf, ",IFF_ALLMULTI");
-    }
- 
--   len += sprintf(buf+len, " ");
--
--   return len;
-+   seq_printf(seqf, " ");
- }
- 
- 
-diff --git a/vmnet-only/hub.c b/vmnet-only/hub.c
-index 47f04ac..8aafb95 100644
---- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -25,6 +25,7 @@
- #include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/poll.h>
-+#include <linux/seq_file.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
- static Bool VNetHubCycleDetect(VNetJack *this, int generation);
- static void VNetHubPortsChanged(VNetJack *this);
- static int  VNetHubIsBridged(VNetJack *this);
--static int  VNetHubProcRead(char *page, char **start, off_t off,
--                            int count, int *eof, void *data);
- 
- static VNetHub *vnetHub;
- static DEFINE_SPINLOCK(vnetHubLock);
-@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetHubProcShow --
-+ *
-+ *      Callback for read operation on hub entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetHubProcShow(struct seq_file  *seqf,   // IN/OUT: buffer to write into
-+                void    *data)   // IN: client data - not used
-+{
-+   VNetJack *jack = (VNetJack*)data;
-+   VNetHub *hub;
-+
-+   if (!jack || !jack->private) {
-+      return 0;
-+   }
-+   hub = (VNetHub*)jack->private;
-+
-+   VNetPrintJack(jack, seqf);
-+
-+   seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
-+   seq_printf(seqf, "\n");
-+   return 0;
-+}
-+
-+static int proc_hub_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetHubProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_hub_fops = {
-+       .open           = proc_hub_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetHubAlloc --
-  *
-  *      Allocate a jack on this hub.
-@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
-           * Make proc entry for this jack.
-           */
- 
--         retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
-+         retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
-          if (retval) {
-             if (retval == -ENXIO) {
-                jack->procEntry = NULL;
-@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
- 	       hub->used[i] = FALSE;
-                return NULL;
-             }
--         } else {
--            jack->procEntry->read_proc = VNetHubProcRead;
--            jack->procEntry->data = jack;
-          }
- 
-          /*
-@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
- }
- 
- 
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetHubProcRead --
-- *
-- *      Callback for read operation on hub entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetHubProcRead(char    *page,   // IN/OUT: buffer to write into
--                char   **start,  // OUT: 0 if file < 4k, else offset into page
--                off_t    off,    // IN: offset of read into the file
--                int      count,  // IN: maximum number of bytes to read
--                int     *eof,    // OUT: TRUE if there is nothing more to read
--                void    *data)   // IN: client data - not used
--{
--   VNetJack *jack = (VNetJack*)data;
--   VNetHub *hub;
--   int len = 0;
--
--   if (!jack || !jack->private) {
--      return len;
--   }
--   hub = (VNetHub*)jack->private;
--
--   len += VNetPrintJack(jack, page+len);
--
--   len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 65f3cb9..b20f56a 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -63,8 +63,6 @@ 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);
- static void VNetNetifSetMulticast(struct net_device *dev);
--static int  VNetNetIfProcRead(char *page, char **start, off_t off,
--                              int count, int *eof, void *data);
- 
- /*
-  *----------------------------------------------------------------------
-@@ -117,6 +115,53 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
- 
- }
- 
-+/*
-+ *----------------------------------------------------------------------
-+ *
-+ * VNetNetIfProcShow --
-+ *
-+ *      Callback for read operation on this netif entry in vnets proc fs.
-+ *
-+ * Results: 
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                  void   *data)  // IN: client data
-+{
-+   VNetNetIF *netIf = data; 
-+   
-+   if (!netIf) {
-+      return 0;
-+   }
-+   
-+   VNetPrintPort(&netIf->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", netIf->dev->name);
-+   
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_netif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_netif_fops = {
-+       .open           = proc_netif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -201,9 +246,9 @@ VNetNetIf_Create(char *devName,  // IN:
-    /*
-     * Make proc entry for this jack.
-     */
--   
--   retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
--                               &netIf->port.jack.procEntry);
-+  
-+   retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
-+                               &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
-    if (retval) {
-       if (retval == -ENXIO) {
-          netIf->port.jack.procEntry = NULL;
-@@ -211,9 +256,6 @@ VNetNetIf_Create(char *devName,  // IN:
-          netIf->port.jack.procEntry = NULL;
-          goto out;
-       }
--   } else {
--      netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead;
--      netIf->port.jack.procEntry->data = netIf;
-    }
- 
-    /*
-@@ -591,45 +633,3 @@ VNetNetifGetStats(struct net_device *dev) // IN:
-    return &netIf->stats;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetNetIfProcRead --
-- *
-- *      Callback for read operation on this netif entry in vnets proc fs.
-- *
-- * Results: 
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetNetIfProcRead(char   *page,  // IN/OUT: buffer to write into
--                  char  **start, // OUT: 0 if file < 4k, else offset into page
--                  off_t   off,   // IN: (unused) offset of read into the file
--                  int     count, // IN: (unused) maximum number of bytes to read
--                  int    *eof,   // OUT: TRUE if there is nothing more to read
--                  void   *data)  // IN: client data
--{
--   VNetNetIF *netIf = (VNetNetIF*)data; 
--   int len = 0;
--   
--   if (!netIf) {
--      return len;
--   }
--   
--   len += VNetPrintPort(&netIf->port, page+len);
--
--   len += sprintf(page+len, "dev %s ", netIf->devName);
--   
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/procfs.c b/vmnet-only/procfs.c
-index ca42ee2..fd7921e 100644
---- a/vmnet-only/procfs.c
-+++ b/vmnet-only/procfs.c
-@@ -45,10 +45,6 @@
- 
- #if defined(CONFIG_PROC_FS)
- 
--static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode,
--                                VNetProcEntry **ret);
--static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent);
--
- static VNetProcEntry *base = NULL;
- 
- 
-@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL;
- int
- VNetProc_Init(void)
- {
--   return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base);
-+	base = proc_mkdir("vmnet", NULL);
-+	if(IS_ERR(base)) {
-+		base = NULL;
-+		return PTR_ERR(base);
-+	}
-+	return 0;
- }
- 
- 
-@@ -94,14 +95,14 @@ VNetProc_Init(void)
- void
- VNetProc_Cleanup(void)
- {
--   VNetProcRemoveEntryInt(base, NULL);
-+   proc_remove(base);
-    base = NULL;
- }
- 
- /*
-  *----------------------------------------------------------------------
-  *
-- * VNetProcMakeEntryInt --
-+ * VNetProc_MakeEntryOps --
-  *
-  *      Make an entry in the vnets proc file system.
-  *
-@@ -116,72 +117,21 @@ VNetProc_Cleanup(void)
-  */
- 
- int
--VNetProcMakeEntryInt(VNetProcEntry  *parent, // IN:
--		     char            *name,  // IN:
-+VNetProc_MakeEntryOps(char            *name,  // IN:
- 		     int              mode,  // IN:
--		     VNetProcEntry  **ret)   // OUT:
-+		     VNetProcEntry  **ret,
-+		     const struct file_operations *fops,
-+		     void *data
-+		     )   // OUT:
- {
-    VNetProcEntry *ent;
--   ent = create_proc_entry(name, mode, parent);
-+   ent = proc_create_data(name, mode, base, fops, data);
-    *ret = ent;
-    if (!ent)
-       return -ENOMEM;
-    return 0;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProcRemoveEntryInt --
-- *
-- *      Remove a previously installed proc entry.
-- *
-- * Results: 
-- *      None.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--void
--VNetProcRemoveEntryInt(VNetProcEntry *node,
--                       VNetProcEntry *parent)
--{
--   if (node) {
--      remove_proc_entry(node->name, parent);
--   }
--}
--
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProc_MakeEntry --
-- *
-- *      Make an entry in the vnets proc file system.
-- *
-- * Results: 
-- *      errno. If errno is 0 and ret is non NULL then ret is filled
-- *      in with the resulting proc entry.
-- *      
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetProc_MakeEntry(char            *name,  // IN:
--		   int              mode,  // IN:
--		   VNetProcEntry  **ret)   // OUT:
--{
--   return VNetProcMakeEntryInt(base, name, mode, ret);
--}
--
--
- /*
-  *----------------------------------------------------------------------
-  *
-@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char            *name,  // IN:
- void
- VNetProc_RemoveEntry(VNetProcEntry *node)
- {
--   VNetProcRemoveEntryInt(node, base);
-+	if(node)
-+		proc_remove(node);
- }
- 
- 
-@@ -253,31 +204,6 @@ VNetProc_Cleanup(void)
- }
- 
- 
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProc_MakeEntry --
-- *
-- *      Make an entry in the vnets proc file system.
-- *
-- * Results: 
-- *      errno. If errno is 0 and ret is non NULL then ret is filled
-- *      in with the resulting proc entry.
-- *      
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetProc_MakeEntry(char            *name,
--                   int              mode,
--                   VNetProcEntry  **ret)
--{
--   return -ENXIO;
--}
--
- 
- /*
-  *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 17b49e0..b01004a 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -387,7 +387,7 @@ VNetUserIfReceive(VNetJack       *this, // IN
- /*
-  *----------------------------------------------------------------------
-  *
-- * VNetUserIfProcRead --
-+ * VNetUserIfProcShow --
-  *
-  *      Callback for read operation on this userif entry in vnets proc fs.
-  *
-@@ -401,30 +401,23 @@ VNetUserIfReceive(VNetJack       *this, // IN
-  */
- 
- static int
--VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
--                   char   **start, // OUT: 0 if file < 4k, else offset into
--                                   //      page
--                   off_t    off,   // IN: offset of read into the file
--                   int      count, // IN: maximum number of bytes to read
--                   int     *eof,   // OUT: TRUE if there is nothing more to
--                                   //      read
-+VNetUserIfProcShow(struct seq_file    *seqf,  // IN/OUT: buffer to write into
-                    void    *data)  // IN: client data - not used
- {
-    VNetUserIF *userIf = (VNetUserIF*)data; 
--   int len = 0;
-    
-    if (!userIf) {
--      return len;
-+      return 0;
-    }
-    
--   len += VNetPrintPort(&userIf->port, page+len);
-+   VNetPrintPort(&userIf->port, seqf);
-    
--   len += sprintf(page+len, "read %u written %u queued %u ",
-+   seq_printf(seqf, "read %u written %u queued %u ",
-                   userIf->stats.read,
-                   userIf->stats.written,
-                   userIf->stats.queued);
-    
--   len += sprintf(page+len, 
-+   seq_printf(seqf, 
- 		  "dropped.down %u dropped.mismatch %u "
- 		  "dropped.overflow %u dropped.largePacket %u",
-                   userIf->stats.droppedDown,
-@@ -432,13 +425,23 @@ VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
-                   userIf->stats.droppedOverflow,
- 		  userIf->stats.droppedLargePacket);
- 
--   len += sprintf(page+len, "\n");
-+   seq_printf(seqf, "\n");
-    
--   *start = 0;
--   *eof   = 1;
--   return len;
-+   return 0;
-+}
-+
-+static int proc_userif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetUserIfProcShow, PDE_DATA(inode));
- }
- 
-+static const struct file_operations proc_userif_fops = {
-+       .open           = proc_userif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -1034,8 +1037,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-     * Make proc entry for this jack.
-     */
-    
--   retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG,
--                               &userIf->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG,
-+                               &userIf->port.jack.procEntry, &proc_userif_fops, userIf);
-    if (retval) {
-       if (retval == -ENXIO) {
-          userIf->port.jack.procEntry = NULL;
-@@ -1043,9 +1046,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-          kfree(userIf);
-          return retval;
-       }
--   } else {
--      userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead;
--      userIf->port.jack.procEntry->data = userIf;
-    }
- 
-    /*
-diff --git a/vmnet-only/vnetInt.h b/vmnet-only/vnetInt.h
-index c615395..d90a1ef 100644
---- a/vmnet-only/vnetInt.h
-+++ b/vmnet-only/vnetInt.h
-@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack);
- 
- void VNetSend(const VNetJack *jack, struct sk_buff *skb);
- 
--int VNetProc_MakeEntry(char *name, int mode,
--                       VNetProcEntry **ret);
-+int VNetProc_MakeEntryOps(char *name, int mode,
-+                       VNetProcEntry **ret,
-+		       const struct file_operations *fops,
-+		       void *data);
- 
- void VNetProc_RemoveEntry(VNetProcEntry *node);
- 
--int VNetPrintJack(const VNetJack *jack, char *buf);
-+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf);
- 
- int VNet_MakeMACAddress(VNetPort *port);
- 
-@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr,
- 
- Bool VNetCycleDetectIf(const char *name, int generation);
- 
--int VNetPrintPort(const VNetPort *port, char *buf);
-+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf);
- 
- int VNetSnprintf(char *str, size_t size, const char *format, ...);
- 
diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
deleted file mode 100644
index 87f89147e2b4..000000000000
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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;
- 	 }
diff --git a/app-emulation/vmware-modules/files/264-3.8.0.patch b/app-emulation/vmware-modules/files/264-3.8.0.patch
deleted file mode 100644
index e1a97d8c9b93..000000000000
--- a/app-emulation/vmware-modules/files/264-3.8.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-[patch] Vmware 9 on Linux Kernel 3.8rc4 and later
-source: http://communities.vmware.com/thread/432897 and bug 458228
-
-diff -rupN a/work/vmci-only/linux/driver.c b/work/vmci-only/linux/driver.c
---- a/work/vmci-only/linux/driver.c	2012-10-31 23:28:45.000000000 -0400
-+++ b/work/vmci-only/linux/driver.c	2013-03-18 15:23:52.488752357 -0400
-@@ -124,7 +124,7 @@ static struct pci_driver vmci_driver = {
-    .name     = "vmci",
-    .id_table = vmci_ids,
-    .probe = vmci_probe_device,
--   .remove = __devexit_p(vmci_remove_device),
-+   .remove = vmci_remove_device,
- };
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-@@ -1741,7 +1741,7 @@ vmci_enable_msix(struct pci_dev *pdev) /
-  *-----------------------------------------------------------------------------
-  */
- 
--static int __devinit
-+static int 
- vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
-                   const struct pci_device_id *id) // IN: matching device ID
- {
-@@ -1969,7 +1969,7 @@ vmci_probe_device(struct pci_dev *pdev,
-  *-----------------------------------------------------------------------------
-  */
- 
--static void __devexit
-+static void 
- vmci_remove_device(struct pci_dev* pdev)
- {
-    struct vmci_device *dev = pci_get_drvdata(pdev);
diff --git a/app-emulation/vmware-modules/files/264-apic.patch b/app-emulation/vmware-modules/files/264-apic.patch
deleted file mode 100644
index 66cd45933246..000000000000
--- a/app-emulation/vmware-modules/files/264-apic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index f1f4b10..c43242f 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -55,6 +55,7 @@
- #include <linux/kthread.h>
- #include <linux/wait.h>
- 
-+#include <asm/apic.h>
- 
- #include "vmware.h"
- #include "x86apic.h"
diff --git a/app-emulation/vmware-modules/files/264-d-make-root.patch b/app-emulation/vmware-modules/files/264-d-make-root.patch
deleted file mode 100644
index a02e4ce0c39e..000000000000
--- a/app-emulation/vmware-modules/files/264-d-make-root.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
-index b7c535e..a36a01e 100644
---- a/vmblock-only/linux/filesystem.c
-+++ b/vmblock-only/linux/filesystem.c
-@@ -525,7 +525,11 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
-       return -EINVAL;
-    }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
-    rootDentry = d_alloc_root(rootInode);
-+#else
-+   rootDentry = d_make_root(rootInode);
-+#endif
-    if (!rootDentry) {
-       iput(rootInode);
-       return -ENOMEM;
diff --git a/app-emulation/vmware-modules/files/264-jobserver.patch b/app-emulation/vmware-modules/files/264-jobserver.patch
deleted file mode 100644
index 59a6ccca1da0..000000000000
--- a/app-emulation/vmware-modules/files/264-jobserver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
---- a/work/vmblock-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmblock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
---- a/work/vmci-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmci-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
---- a/work/vmmon-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmmon-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
---- a/work/vmnet-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vmnet-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
---- a/work/vsock-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vsock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
diff --git a/app-emulation/vmware-modules/files/264-makefile-include.patch b/app-emulation/vmware-modules/files/264-makefile-include.patch
deleted file mode 100644
index 39c300030805..000000000000
--- a/app-emulation/vmware-modules/files/264-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
-index ab7a727..e3ec9d2 100644
---- a/vmblock-only/Makefile.kernel
-+++ b/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
-diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
-index ba343ee..861ea83 100644
---- a/vmci-only/Makefile.kernel
-+++ b/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- obj-m += $(DRIVER).o
- 
-diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
-index 8770d1d..c4746c3 100644
---- a/vmmon-only/Makefile.kernel
-+++ b/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
- 
-diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
-index d1e3133..665d428 100644
---- a/vmnet-only/Makefile.kernel
-+++ b/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
-diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
-index b4629ee..264b8cb 100644
---- a/vsock-only/Makefile.kernel
-+++ b/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
- 
- 
diff --git a/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d12fed0..000000000000
--- a/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/264-netdevice.patch b/app-emulation/vmware-modules/files/264-netdevice.patch
deleted file mode 100644
index 35231a3205e3..000000000000
--- a/app-emulation/vmware-modules/files/264-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- #   define net_device device
- #endif
- 
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
-+					   functions are available. */
-+#define HAVE_FREE_NETDEV		/* free_netdev() */
-+#define HAVE_NETDEV_PRIV		/* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
- 
- /*
-  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
diff --git a/app-emulation/vmware-modules/files/264-newline.patch b/app-emulation/vmware-modules/files/264-newline.patch
deleted file mode 100644
index b406d81ef73d..000000000000
--- a/app-emulation/vmware-modules/files/264-newline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmnet-only/userif.c 2012-06-09 04:26:32.000000000 -0400
-+++ vmnet-only.new/userif.c     2012-10-22 12:14:34.275953107 -0400
-@@ -956,7 +956,7 @@ VNetUserIfSetUplinkState(VNetPort *port,
-               "failed (%d)\n", userIf->port.id, retval));
-    }
- 
--   LOG(0, (KERN_NOTICE "userif-%d: sent link %s event.", 
-+   LOG(0, (KERN_NOTICE "userif-%d: sent link %s event.\n", 
-            userIf->port.id, linkUp?"up":"down"));
- 
-    return retval;
diff --git a/app-emulation/vmware-modules/files/264-putname.patch b/app-emulation/vmware-modules/files/264-putname.patch
deleted file mode 100644
index 6e76130fa165..000000000000
--- a/app-emulation/vmware-modules/files/264-putname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
-index 79716bd..2dd83fe 100644
---- a/vmblock-only/linux/control.c
-+++ b/vmblock-only/linux/control.c
-@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
- 
-    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
- 
--   putname(name);
-+   __putname(name);
- 
-    return retval;
- }