From 0cbd41570f28031eae63ac82ddff69c7ab131fae Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 3 Dec 2015 14:49:15 +0100
Subject: [vmware] Bump version to 12.0.1

---
 remote/modules/vmware/module.conf                  |  2 +-
 .../vmware/patches/vmci__4.3-4.3__12.0.0.patch     | 26 ++++++++++++++++++++++
 .../vmware/patches/vmmon__4.3-4.3__12.0.0.patch    | 13 +++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 remote/modules/vmware/patches/vmci__4.3-4.3__12.0.0.patch
 create mode 100644 remote/modules/vmware/patches/vmmon__4.3-4.3__12.0.0.patch

(limited to 'remote')

diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
index abbb9f3a..8166665c 100644
--- a/remote/modules/vmware/module.conf
+++ b/remote/modules/vmware/module.conf
@@ -1,4 +1,4 @@
-REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.0.0/2985596/linux/core/"
+REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.0.1/3160714/linux/core/"
 REQUIRED_TYPE="workstation"
 REQUIRED_MODULES="kernel"
 REQUIRED_DIRECTORIES="
diff --git a/remote/modules/vmware/patches/vmci__4.3-4.3__12.0.0.patch b/remote/modules/vmware/patches/vmci__4.3-4.3__12.0.0.patch
new file mode 100644
index 00000000..05dae1b7
--- /dev/null
+++ b/remote/modules/vmware/patches/vmci__4.3-4.3__12.0.0.patch
@@ -0,0 +1,26 @@
+--- a/linux/driver.c	2015-09-14 21:07:49.751696932 +0200
++++ b/linux/driver.c	2015-09-14 22:10:48.015908198 +0200
+@@ -2467,8 +2467,6 @@
+ static void __exit
+ vmci_exit(void)
+ {
+-   int retval;
+-
+    if (guestDeviceInit) {
+       pci_unregister_driver(&vmci_driver);
+       vfree(data_buffer);
+@@ -2480,12 +2478,8 @@
+ 
+       VMCI_HostCleanup();
+ 
+-      retval = misc_deregister(&linuxState.misc);
+-      if (retval) {
+-         Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
+-      } else {
+-         Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+-      }
++      misc_deregister(&linuxState.misc);
++      Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+ 
+       hostDeviceInit = FALSE;
+    }
diff --git a/remote/modules/vmware/patches/vmmon__4.3-4.3__12.0.0.patch b/remote/modules/vmware/patches/vmmon__4.3-4.3__12.0.0.patch
new file mode 100644
index 00000000..3f5a950a
--- /dev/null
+++ b/remote/modules/vmware/patches/vmmon__4.3-4.3__12.0.0.patch
@@ -0,0 +1,13 @@
+--- a/linux/driver.c	2015-08-14 22:39:49.000000000 +0200
++++ b/linux/driver.c	2015-09-14 22:11:06.807909249 +0200
+@@ -387,9 +387,7 @@
+ #ifdef VMX86_DEVEL
+    unregister_chrdev(linuxState.major, linuxState.deviceName);
+ #else
+-   if (misc_deregister(&linuxState.misc)) {
+-      Warning("Module %s: error unregistering\n", linuxState.deviceName);
+-   }
++   misc_deregister(&linuxState.misc);
+ #endif
+ 
+    Log("Module %s: unloaded\n", linuxState.deviceName);
-- 
cgit v1.2.3-55-g7522