From: VMware, Inc <>
Date: Fri, 12 Apr 2013 19:49:31 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2013.04.16-1098359~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1875efcc128cbea02431c6bc827a8a993278dd44;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

`Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
index 756f291d9..23b36e2ee 100644
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
@@ -173,7 +173,11 @@ typedef struct Vmxnet2_TxRingEntry {
  * functions below to be used.
  */
 typedef struct Vmxnet2_RxRingInfo {
+#ifdef VMX86_VMX
+   PA                      basePA;     /* starting PA of the ring */
+#else
    Vmxnet2_RxRingEntry    *base;       /* starting addr of the ring */
+#endif
    uint32                  nicNext;    /* next entry to use in the ring */
    uint32                  ringLength; /* # of entries in the ring */
    PA                      startPA;    /* PA of the starting addr of the ring */
@@ -183,7 +187,11 @@ typedef struct Vmxnet2_RxRingInfo {
 } Vmxnet2_RxRingInfo;
 
 typedef struct Vmxnet2_TxRingInfo {
+#ifdef VMX86_VMX
+   PA                      basePA;     /* starting PA of the ring */
+#else
    Vmxnet2_TxRingEntry    *base;       /* starting addr of the ring */
+#endif
    uint32                  nicNext;    /* next entry to use in the ring */
    uint32                  ringLength; /* # of entries in the ring */
    PA                      startPA;    /* PA of the starting addr of the ring */
@@ -349,7 +357,7 @@ typedef struct VmxnetVMKShared {
    uint32  dontPostActions;  
 } VmxnetVMKShared;
 
-#if defined VMX86_VMX || defined VMKERNEL
+#if defined VMKERNEL
 
 /*
  * Inline functions used to assist the implementation of the vmxnet interface.