diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2012-01-06 21:23:43 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2012-01-06 21:23:43 +0000 |
| commit | cdfdb61d29316e2865b0e2445700faf8b18436dd (patch) | |
| tree | a8c7288528a3a4283435bce34df5626e7cf8d3d0 | |
| parent | vmware-modules: patch for 3.2 kernel (diff) | |
| download | vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.tar.gz vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.tar.bz2 vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.zip | |
vmware-modules: fixed patch for 3.2 kernel
svn path=/trunk/; revision=530
| -rw-r--r-- | app-emulation/vmware-modules/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/vmware-modules/files/264-3.2.0.patch | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index e44a720..626666b 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -7,7 +7,7 @@ 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 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 60a0be2..5baa61d 100644 --- 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 { |