Delete vsockLookup.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index aca676993efb70662429b530775c978ef463109b..7ed4f61df8cf8cb6d79c2f82fdf9b9ee6e15aa67 100644 (file)
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -33,7 +33,6 @@
    LOGLEVEL_VAR(aio), \
    LOGLEVEL_VAR(passthrough), \
    LOGLEVEL_VAR(tools), \
-   LOGLEVEL_VAR(vsockLookup), \
    LOGLEVEL_VAR(license), \
    LOGLEVEL_VAR(vui), \
    LOGLEVEL_VAR(stats), \

diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index 55388f16209c5d330a7b021a3fc28ebeec674224..c44007c9ee5da82962a47a8b10f3aeb9b5cdf55c 100644 (file)
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -92,7 +92,10 @@ typedef uint32 VMCI_Resource;
 #define VMCI_EVENT_UNSUBSCRIBE    9
 #define VMCI_QUEUEPAIR_ALLOC      10
 #define VMCI_QUEUEPAIR_DETACH     11
-#define VMCI_VSOCK_VMX_LOOKUP     12
+/*
+ * VMCI_VSOCK_VMX_LOOKUP was assigned to 12 for Fusion 3.0/3.1,
+ * WS 7.0/7.1 and ESX 4.1
+ */
 #define VMCI_HGFS_TRANSPORT       13
 #define VMCI_RESOURCE_MAX         14
 

diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h
index cae06dd746f3024473843439b68aa61bf035fdf4..29690c8245a636ffe308ef91e97a96d986a7de61 100644 (file)
--- a/open-vm-tools/modules/linux/shared/vmci_defs.h
+++ b/open-vm-tools/modules/linux/shared/vmci_defs.h
@@ -92,7 +92,10 @@ typedef uint32 VMCI_Resource;
 #define VMCI_EVENT_UNSUBSCRIBE    9
 #define VMCI_QUEUEPAIR_ALLOC      10
 #define VMCI_QUEUEPAIR_DETACH     11
-#define VMCI_VSOCK_VMX_LOOKUP     12
+/*
+ * VMCI_VSOCK_VMX_LOOKUP was assigned to 12 for Fusion 3.0/3.1,
+ * WS 7.0/7.1 and ESX 4.1
+ */
 #define VMCI_HGFS_TRANSPORT       13
 #define VMCI_RESOURCE_MAX         14
 

diff --git a/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c b/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
index 7dfcefd2d86aab907bd1a39776ce8bb552df7d77..b9eb870bba323ab9cc1180e9748df8fef8dbe5b0 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
+++ b/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
@@ -441,9 +441,7 @@ VSockAddr_SocketContextDgram(uint32 cid,  // IN
                              uint32 rid)  // IN
 {
    if (cid == VMCI_HYPERVISOR_CONTEXT_ID) {
-      if (rid != VMCI_VSOCK_VMX_LOOKUP) {
-         return FALSE;
-      }
+      return FALSE;
    }
 
    return TRUE;