From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 28 Jul 2017 19:16:51 +0000 (-0700)
Subject: The previous change to the Linux VMCI driver resulted in intermittent
X-Git-Tag: stable-10.1.10~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d58086d3f3218024ecee479034f4441a27fe278f;p=thirdparty%2Fopen-vm-tools.git

The previous change to the Linux VMCI driver resulted in intermittent
hangs during soft reboots of RHEL 6.8 Linux VM.  This change reverts
that code change and resets the driver version number.

This reverts commit 7023998ba5594871a658c5ef1be4dbda6c0158eb.
---

diff --git a/open-vm-tools/modules/linux/vmci/linux/driver.c b/open-vm-tools/modules/linux/vmci/linux/driver.c
index 579e008b7..77636a032 100644
--- a/open-vm-tools/modules/linux/vmci/linux/driver.c
+++ b/open-vm-tools/modules/linux/vmci/linux/driver.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2011-2014,2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011-2014 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -2015,8 +2015,6 @@ vmci_remove_device(struct pci_dev* pdev)
    dev->exclusive_vectors = FALSE;
    dev->intr_type = VMCI_INTR_TYPE_INTX;
 
-   tasklet_disable(&vmci_dg_tasklet);
-   tasklet_disable(&vmci_bm_tasklet);
    tasklet_kill(&vmci_dg_tasklet);
    tasklet_kill(&vmci_bm_tasklet);
 
@@ -2478,7 +2476,6 @@ vmci_exit(void)
    if (guestDeviceInit) {
       pci_unregister_driver(&vmci_driver);
       vfree(data_buffer);
-      data_buffer = NULL;
       guestDeviceInit = FALSE;
    }
 
diff --git a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
index b472a66b2..aecf0b6d6 100644
--- a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
+++ b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2014,2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2014 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -25,8 +25,8 @@
 #ifndef _VMCI_VERSION_H_
 #define _VMCI_VERSION_H_
 
-#define VMCI_DRIVER_VERSION          9.8.2.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,8,2,0
-#define VMCI_DRIVER_VERSION_STRING   "9.8.2.0"
+#define VMCI_DRIVER_VERSION          9.8.1.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,8,1,0
+#define VMCI_DRIVER_VERSION_STRING   "9.8.1.0"
 
 #endif /* _VMCI_VERSION_H_ */